jmq/Documentation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

pkgmeek: revert to using bsdtar now that C.UTF-8 is a valid locale

Browse Source
This commit is contained in:
John McQuah 2022-08-25 10:29:20 -04:00
parent dd5dcd96f5
commit 437fd837f9
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/pkgmeek
View File

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