Fix iglupkg + logging
This commit is contained in:
parent
27fefbd9f8
commit
6ff5dc302c
1 changed files with 7 additions and 4 deletions
11
iglupkg.sh
11
iglupkg.sh
|
@ -137,11 +137,11 @@ if command -V iglu 2>/dev/null; then
|
||||||
missing=""
|
missing=""
|
||||||
|
|
||||||
missing=$(echo $mkdeps | tr ":" "\n" | while read mkdep; do \
|
missing=$(echo $mkdeps | tr ":" "\n" | while read mkdep; do \
|
||||||
[ -f /usr/share/iglupkg/$mkdep ] || echo " $mkdep"; done)
|
[ -e /usr/share/iglupkg/$mkdep ] || echo " $mkdep"; done)
|
||||||
[ ! -z "$missing" ] && fatal "missing make dependencies: $missing"
|
[ ! -z "$missing" ] && fatal "missing make dependencies: $missing"
|
||||||
|
|
||||||
missing=$(echo $deps | tr ":" "\n" | while read dep; do \
|
missing=$(echo $deps | tr ":" "\n" | while read dep; do \
|
||||||
[ -f /usr/share/iglupkg/$dep ] || echo " $dep"; done)
|
[ -e /usr/share/iglupkg/$dep ] || echo " $dep"; done)
|
||||||
[ ! -z "$missing" ] && fatal "missing runtime dependencies: $missing"
|
[ ! -z "$missing" ] && fatal "missing runtime dependencies: $missing"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -214,7 +214,7 @@ _p() {
|
||||||
cd "$srcdir"
|
cd "$srcdir"
|
||||||
_genmeta > "$pkgdir/usr/share/iglupkg/$pkgname$cross"
|
_genmeta > "$pkgdir/usr/share/iglupkg/$pkgname$cross"
|
||||||
cd "$pkgdir"
|
cd "$pkgdir"
|
||||||
if command -V zstd; then
|
if command -V zstd > /dev/null 2> /dev/null; then
|
||||||
tar --owner=0 --group=0 -cf ../$pkgname$cross.$pkgver.tar.zst * -I zstd
|
tar --owner=0 --group=0 -cf ../$pkgname$cross.$pkgver.tar.zst * -I zstd
|
||||||
else
|
else
|
||||||
tar --owner=0 --group=0 -cf ../$pkgname$cross.$pkgver.tar *
|
tar --owner=0 --group=0 -cf ../$pkgname$cross.$pkgver.tar *
|
||||||
|
@ -232,12 +232,15 @@ _p() {
|
||||||
cd "$srcdir"
|
cd "$srcdir"
|
||||||
_genmeta $e > "$pkgdir-$e/usr/share/iglupkg/$pkgname$cross"
|
_genmeta $e > "$pkgdir-$e/usr/share/iglupkg/$pkgname$cross"
|
||||||
cd "$pkgdir-$e"
|
cd "$pkgdir-$e"
|
||||||
if command -V zstd; then
|
if command -V zstd > /dev/null 2> /dev/null; then
|
||||||
tar --owner=0 --group=0 -cf ../$pkgname-$e$cross.$pkgver.tar.zst * -I zstd
|
tar --owner=0 --group=0 -cf ../$pkgname-$e$cross.$pkgver.tar.zst * -I zstd
|
||||||
else
|
else
|
||||||
tar --owner=0 --group=0 -cf ../$pkgname-$e$cross.$pkgver.tar *
|
tar --owner=0 --group=0 -cf ../$pkgname-$e$cross.$pkgver.tar *
|
||||||
fi
|
fi
|
||||||
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
echo "done packaging"
|
||||||
}
|
}
|
||||||
|
|
||||||
if [ -z "$to_run" ]; then
|
if [ -z "$to_run" ]; then
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue