bonsai/kiss
3
0
Fork 0
forked from kiss-community/kiss
Code Issues 2 Pull Requests Projects Releases Activity

kiss: set KISS_COMPRESS once

Browse Source
This commit is contained in:
Dylan Araps 2021-07-08 11:15:31 +03:00
parent 40fd458c8f
commit 3e08cf1ff2
No known key found for this signature in database
GPG Key ID: 13295DAC2CF13B5C
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
kiss
View File

@ -240,7 +240,7 @@ pkg_cache() {
set +f set +f
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."* "$bin_dir/$1@$repo_ver-$repo_rel.tar."*
tar_file=$1 tar_file=$1
@ -656,14 +656,14 @@ pkg_tar() (
cd "$pkg_dir/$1" cd "$pkg_dir/$1"
# Create a tarball from the contents of the built package. # 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 ;; bz2) bzip2 -z ;;
gz) gzip -6 ;; gz) gzip -6 ;;
lzma) lzma -z ;; lzma) lzma -z ;;
lz) lzip -z ;; lz) lzip -z ;;
xz) xz -zT0 ;; xz) xz -zT0 ;;
zst) zstd -z ;; 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" log "$1" "Successfully created tarball"
run_hook post-package "$1" 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. # up before we die. This occurs on 'Ctrl+C' as well as success and error.
trap pkg_clean EXIT INT 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 # Figure out which 'sudo' command to use based on the user's choice or what
# is available on the system. # is available on the system.
cmd_su=${KISS_SU:-"$( cmd_su=${KISS_SU:-"$(