bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libmakepkg: fix reporting of invalid archive extensions in compress.sh

Browse source 
In commit 1825bd6716 this was split out
from makepkg, but the warning was not properly migrated; $ext did not
ever exist.

As a result, no matter what you did, the only possible warning was:

==> WARNING: '' is not a valid archive extension.

Fix to filter based on the presence of .tar in the argument, and
building the $ext variable for all checking and messaging purposes
within the function.

Signed-off-by: Eli Schwartz <eschwartz@archlinux.org>
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Eli Schwartz 2019-03-12 13:28:27 -04:00 • committed by Allan McRae
parent 35a0d5e744
commit ee5f24e50c
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
scripts/libmakepkg/util/compress.sh.in
View file

@ -29,21 +29,21 @@ source "$LIBRARY/util/message.sh"
# Wrapper around many stream compression formats, for use in the middle of a # Wrapper around many stream compression formats, for use in the middle of a
# pipeline. A tar archive is passed on stdin and compressed to stdout. # pipeline. A tar archive is passed on stdin and compressed to stdout.
compress_as() { compress_as() {
# $1: final archive filename extension for compression type detection # $1: final archive filename extension for compression type detection
local filename="$1" local ext=".tar${1##*.tar}"
case "$filename" in case "$ext" in
*tar.gz) ${COMPRESSGZ[@]:-gzip -c -f -n} ;; *.tar.gz) ${COMPRESSGZ[@]:-gzip -c -f -n} ;;
*tar.bz2) ${COMPRESSBZ2[@]:-bzip2 -c -f} ;; *.tar.bz2) ${COMPRESSBZ2[@]:-bzip2 -c -f} ;;
*tar.xz) ${COMPRESSXZ[@]:-xz -c -z -} ;; *.tar.xz) ${COMPRESSXZ[@]:-xz -c -z -} ;;
*tar.zst) ${COMPRESSZST[@]:-zstd -c -z -q -} ;; *.tar.zst) ${COMPRESSZST[@]:-zstd -c -z -q -} ;;
*tar.lrz) ${COMPRESSLRZ[@]:-lrzip -q} ;; *.tar.lrz) ${COMPRESSLRZ[@]:-lrzip -q} ;;
*tar.lzo) ${COMPRESSLZO[@]:-lzop -q} ;; *.tar.lzo) ${COMPRESSLZO[@]:-lzop -q} ;;
*tar.Z) ${COMPRESSZ[@]:-compress -c -f} ;; *.tar.Z) ${COMPRESSZ[@]:-compress -c -f} ;;
*tar.lz4) ${COMPRESSLZ4[@]:-lz4 -q} ;; *.tar.lz4) ${COMPRESSLZ4[@]:-lz4 -q} ;;
*tar.lz) ${COMPRESSLZ[@]:-lzip -c -f} ;; *.tar.lz) ${COMPRESSLZ[@]:-lzip -c -f} ;;
*tar) cat ;; *.tar) cat ;;
*) warning "$(gettext "'%s' is not a valid archive extension.")" \ *) warning "$(gettext "'%s' is not a valid archive extension.")" \
"$ext"; cat ;; "$ext"; cat ;;
esac esac