Fix iglupkg + logging

This commit is contained in:
kernelpanic 2022-07-29 23:08:10 +00:00
parent 27fefbd9f8
commit 6ff5dc302c

View file

@ -137,11 +137,11 @@ if command -V iglu 2>/dev/null; then
missing=""
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"
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"
fi
@ -214,7 +214,7 @@ _p() {
cd "$srcdir"
_genmeta > "$pkgdir/usr/share/iglupkg/$pkgname$cross"
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
else
tar --owner=0 --group=0 -cf ../$pkgname$cross.$pkgver.tar *
@ -232,12 +232,15 @@ _p() {
cd "$srcdir"
_genmeta $e > "$pkgdir-$e/usr/share/iglupkg/$pkgname$cross"
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
else
tar --owner=0 --group=0 -cf ../$pkgname-$e$cross.$pkgver.tar *
fi
done
fi
echo "done packaging"
}
if [ -z "$to_run" ]; then