diff options
author | dylan.araps@gmail.com <dylan.araps@gmail.com> | 2020-02-19 22:57:11 +0000 |
---|---|---|
committer | dylan.araps@gmail.com <dylan.araps@gmail.com> | 2020-02-19 22:57:11 +0000 |
commit | 8dcfebc0c19081e6ab0dd925da131113833c05f7 (patch) | |
tree | 8558cf13cf81d585be7826e19e2556bad3aae84e | |
parent | 7e95d6602896f2e64d258c3667c981d5b14ea313 (diff) | |
download | cpt-8dcfebc0c19081e6ab0dd925da131113833c05f7.tar.gz |
kiss: misc clean up
FossilOrigin-Name: b68e2f781e36c1fb5d5fb6809c17df8fd305179ca31ee59b805fa251b3be1af3
-rwxr-xr-x | kiss | 8 |
1 files changed, 2 insertions, 6 deletions
@@ -1153,7 +1153,6 @@ pkg_updates() { set -f - # If the package manager has an update, handle it first. contains "$outdated" kiss && { log "Detected package manager update" log "The package manager will be updated first" @@ -1169,7 +1168,6 @@ pkg_updates() { exit 0 } - # End here if no packages have an update. [ "$outdated" ] || { log "Everything is up to date" return @@ -1183,7 +1181,6 @@ pkg_updates() { "${PAGER:-less}" "$mak_dir/log" # Tell 'pkg_build' to always prompt before build. - pkg_update=1 # Build all packages requiring an update. # See [1] at top of script. @@ -1225,7 +1222,7 @@ args() { # This handles the globbing characters '*', '!', '[' and ']' as per: # https://pubs.opengroup.org/onlinepubs/009695399/utilities/xcu_chap02.html [ "${action##[as]*}" ] && - case $@ in *'*'*|*'!'*|*'['*|*']'*) + case $@ in *\**|*\!*|*\[*|*\]*) die "Arguments contain invalid characters: '!*[]'" esac @@ -1402,8 +1399,7 @@ main() { "${tar_dir:=$cac_dir/extract-$pid}" \ "${src_dir:=$cac_dir/sources}" \ "${log_dir:=$cac_dir/logs}" \ - "${bin_dir:=$cac_dir/bin}" \ - || die "Couldn't create cache directories" + "${bin_dir:=$cac_dir/bin}" args "$@" } |