diff --git a/scripts/pkgmeek b/scripts/pkgmeek index 7694f68..2ea9f2e 100755 --- a/scripts/pkgmeek +++ b/scripts/pkgmeek @@ -28,7 +28,7 @@ fi # Read the Pkgfile to determine what to do next. But first ensure that # it came from a trusted source (FS#1851) # -[ "$PKGMK_UPDATE_SIG" = "yes" ] || validate_pkgfile || exit $E_PKGFILE +[ "$PKGMK_UPDATE_SIG" = "yes" ] && [ -e ./Pkgfile ] || validate_pkgfile || exit $E_PKGFILE [ -f .32bit ] && PGKMK_ARCH=32 || PKGMK_ARCH=64 . "Pkgfile"; . "$PKGMK_CONF" @@ -141,10 +141,8 @@ if [ "$pkg_utd" = 0 ] || [ "$PKGMK_FORCE" = "yes" ]; then for (( u=0; u<${#_local_[@]}; u++ )) ; do here="${_local_[$u]}" case "$here" in - *.tar|*.tar.gz|*.tar.Z|*.tgz|*.tar.bz2|*.tbz2|*.tar.xz|*.txz|*.tar.lzma|*.tar.lz) - tar -C src --no-same-owner -paxf "$here" || errUZ+=1 ;; - *.7z|*.zip|*.rpm) - 7z x -osrc "$here" || errUZ+=1 ;; + *.tar|*.tar.gz|*.tar.Z|*.tgz|*.tar.bz2|*.tbz2|*.tar.xz|*.txz|*.tar.lzma|*.tar.lz|*.7z|*.zip|*.rpm) + bsdtar -p -o -C src -xf "$here" || errUZ+=1 ;; *) cp -r "$here" src/ ;; esac