kiss: cleanup

This commit is contained in:
Dylan Araps 2020-02-03 11:02:04 +02:00
parent e293eb00a6
commit 9b19bc0fab
No known key found for this signature in database
GPG Key ID: 46D62DD9F1DE636E
1 changed files with 8 additions and 25 deletions

33
kiss
View File

@ -1130,16 +1130,10 @@ args() {
#
# This handles the globbing characters '*', '!', '[' and ']' as per:
# https://pubs.opengroup.org/onlinepubs/009695399/utilities/xcu_chap02.html
case $action in
a|alternatives|s|search) ;;
*)
case $@ in
*'*'*|*'!'*|*'['*|*']'*)
die "Arguments contain invalid characters: '!*[]'"
;;
esac
esac
[ "${action#[as]*}" ] &&
case $@ in *'*'*|*'!'*|*'['*|*']'*)
die "Arguments contain invalid characters: '!*[]'"
esac
# Parse some arguments earlier to remove the need to duplicate code.
case $action in
@ -1260,21 +1254,10 @@ args() {
done
;;
l|list)
pkg_list "$@"
;;
u|update)
pkg_updates
;;
s|search)
for pkg; do pkg_find "$pkg" all; done
;;
v|version|-v|--version)
log kiss 1.1.7
;;
l|list) pkg_list "$@" ;;
u|update) pkg_updates ;;
s|search) for pkg; do pkg_find "$pkg" all; done ;;
v|version) log kiss 1.1.7 ;;
h|help|-h|--help|'')
log 'kiss [a|b|c|i|l|r|s|u|v] [pkg] [pkg] [pkg]'