From 3e08cf1ff269e7bf121eec23f86dca0fd55b115d Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 8 Jul 2021 11:15:31 +0300 Subject: [PATCH] kiss: set KISS_COMPRESS once --- kiss | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/kiss b/kiss index 20aad28..6390f94 100755 --- a/kiss +++ b/kiss @@ -240,7 +240,7 @@ pkg_cache() { set +f set -f -- \ - "$bin_dir/$1@$repo_ver-$repo_rel.tar.${KISS_COMPRESS:=gz}" \ + "$bin_dir/$1@$repo_ver-$repo_rel.tar.$KISS_COMPRESS" \ "$bin_dir/$1@$repo_ver-$repo_rel.tar."* tar_file=$1 @@ -656,14 +656,14 @@ pkg_tar() ( cd "$pkg_dir/$1" # Create a tarball from the contents of the built package. - tar cf - . | case ${KISS_COMPRESS:=gz} in + tar cf - . | case $KISS_COMPRESS in bz2) bzip2 -z ;; gz) gzip -6 ;; lzma) lzma -z ;; lz) lzip -z ;; xz) xz -zT0 ;; zst) zstd -z ;; - esac > "$bin_dir/$1@$repo_ver-$repo_rel.tar.${KISS_COMPRESS:=gz}" + esac > "$bin_dir/$1@$repo_ver-$repo_rel.tar.$KISS_COMPRESS" log "$1" "Successfully created tarball" run_hook post-package "$1" @@ -1710,6 +1710,9 @@ main() { # up before we die. This occurs on 'Ctrl+C' as well as success and error. trap pkg_clean EXIT INT + # Default compression method. + : "${KISS_COMPRESS:=gz}" + # Figure out which 'sudo' command to use based on the user's choice or what # is available on the system. cmd_su=${KISS_SU:-"$(