Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--asp.in14
-rw-r--r--util.inc.sh1
2 files changed, 8 insertions, 7 deletions
diff --git a/asp.in b/asp.in
index 99f69fe..69c3bdc 100644
--- a/asp.in
+++ b/asp.in
@@ -5,8 +5,8 @@ ARCH_GIT_REPOS=(packages community)
OPT_ARCH=$(uname -m)
OPT_FORCE=0
-: ${ASPROOT:=${XDG_CACHE_HOME:-$HOME/.cache}/asp}
-: ${ASPCACHE:=$ASPROOT/cache}
+: "${ASPROOT:=${XDG_CACHE_HOME:-$HOME/.cache}/asp}"
+: "${ASPCACHE:=$ASPROOT/cache}"
m4_include(util.inc.sh)
m4_include(remote.inc.sh)
@@ -53,12 +53,12 @@ __require_argc() {
local min max argc=$2
case $1 in
- *-*)
- IFS=- read -r min max <<<"$1"
- ;;
*-)
min=${1%-}
;;
+ *-*)
+ IFS=- read -r min max <<<"$1"
+ ;;
*)
min=$1 max=$1
;;
@@ -203,7 +203,7 @@ untrack() {
disk_usage() {
local usage
- read usage _ < <(du -sh "$ASPROOT")
+ read -r usage _ < <(du -sh "$ASPROOT")
log_info 'Using %s on disk.' "$usage"
}
@@ -311,7 +311,7 @@ dispatch_action() {
# exact match
if declare -F "action__$1" &>/dev/null; then
- "action__$@"
+ "action__$1" "${@:2}"
return
fi
diff --git a/util.inc.sh b/util.inc.sh
index 7529eca..3aae736 100644
--- a/util.inc.sh
+++ b/util.inc.sh
@@ -1,4 +1,5 @@
log_meta() {
+ # shellcheck disable=SC2059
printf "$1 $2\\n" "${@:3}"
}