From: Sergey Matveev Date: Thu, 24 Apr 2025 08:02:20 +0000 (+0300) Subject: Do not require meta4ra-check for pkg-inst X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=ed4407fb246ce9e86b5c590e0f612dc4791a9b6e11fdfb9bd80c383ab6546366;p=bass.git Do not require meta4ra-check for pkg-inst --- diff --git a/build/lib/pkg-inst b/build/lib/pkg-inst index 85b5dc2..ff2ae72 100755 --- a/build/lib/pkg-inst +++ b/build/lib/pkg-inst @@ -42,11 +42,15 @@ else tmp=$(mktemp -d "$SKELBINS"/$ARCH/tmp/$NAMENHASH.XXXXXX) trap "$BASS_ROOT/bin/rm-r $tmp" HUP PIPE INT QUIT TERM EXIT cd $tmp - $TAR xf $skelpkg bin.meta4 - $TAR xfO $skelpkg bin | { - meta4ra-check -hashes "$META4RA_HASHES" -pipe -meta4 bin.meta4 $NAMENHASH || - touch untar-failed - } | $TAR xf - || touch untar-failed + if command -v meta4ra-check >/dev/null ; then + $TAR xf $skelpkg bin.meta4 + $TAR xfO $skelpkg bin | { + meta4ra-check -hashes "$META4RA_HASHES" -pipe -meta4 bin.meta4 $NAMENHASH || + touch untar-failed + } | $TAR xf - || touch untar-failed + else + $TAR xfO $skelpkg bin | $TAR xf - || touch untar-failed + fi [ ! -e untar-failed ] rm -f $fn.meta4 find $tmp/$namenhash -type f -or -type d -exec $FSYNC {} +