Merge branch 'exp/upstream' of euler271/asp32 into master

3 files changed, 9 insertions, 8 deletions

diff --git a/asp32.in b/asp32.in
index c5f5417..b5471d8 100644
--- a/asp32.in
+++ b/asp32.in
@@ -5,8 +5,8 @@ ARCH_GIT_REPOS=(packages64 community64 packages32)
 
 OPT_ARCH=$(uname -m)
 OPT_FORCE=0
-: ${ASPROOT:=${XDG_CACHE_HOME:-$HOME/.cache}/asp32}
-: ${ASPCACHE:=$ASPROOT/cache}
+: "${ASPROOT:=${XDG_CACHE_HOME:-$HOME/.cache}/asp32}"
+: "${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
       ;;
@@ -207,7 +207,7 @@ untrack() {
 
 disk_usage() {
   local usage
-  read usage _ < <(du -sh "$ASPROOT")
+  read -r usage _ < <(du -sh "$ASPROOT")
 
   log_info 'Using %s on disk.' "$usage"
 }
@@ -319,7 +319,7 @@ dispatch_action() {
 
   # exact match
   if declare -F "action__$1" &>/dev/null; then
-    "action__$@"
+    "action__$1" "${@:2}"
     return
   fi
 
diff --git a/package.inc.sh b/package.inc.sh
index 99f815e..109a75e 100644
--- a/package.inc.sh
+++ b/package.inc.sh
@@ -171,7 +171,7 @@ package_checkout() {
       git branch -qf --no-track {,}"$remote/packages/$pkgname"
 
   quiet_git clone \
-    --local \
+    --shared \
     --single-branch \
     --branch "$remote/packages/$pkgname" \
     --config "pull.rebase=true" \
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}"
 }