From 51c92cf2c7358f6548eccf36b6e7a5d75a5e6d1b Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 6 Feb 2020 13:31:47 +0200 Subject: [PATCH] kiss: kiss b, simpler --- kiss | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/kiss b/kiss index 47a17e4..1d2c00a 100755 --- a/kiss +++ b/kiss @@ -1252,18 +1252,9 @@ args() { b|build) # If no arguments were passed, rebuild all packages. - [ "$1" ] || { - cd "$sys_db" || die "Failed to find package db" + [ "$1" ] || { cd "$sys_db" && { set +f; set -f -- *; } } - # Use a glob after 'cd' to generate a list of all installed - # packages based on directory names. - set +f; set -f -- * - - # Undo the above 'cd' to ensure we stay in the same location. - cd - >/dev/null - } - - pkg_build "$@" + pkg_build "${@:?No packages installed}" ;; c|checksum) @@ -1332,13 +1323,13 @@ main() { # Prefer GNU grep if installed as it is much much faster than busybox's # implementation. Very much worth it if you value performance over - # POSIX correctness. + # POSIX correctness (grep quoted to avoid shellcheck false-positive). grep=$(command -v ggrep) || grep='grep' # Prefer libarchive tar or GNU tar if installed as they are much # much faster than busybox's implementation. Very much worth it if # you value performance. - tar=$(command -v bsdtar || command -v gtar) || tar='tar' + tar=$(command -v bsdtar || command -v gtar) || tar=tar # Figure out which 'sudo' command to use based on the user's choice or # what is available on the system.