diff options
| author | Erich Eckner <deep42thought@noreply.example.org> | 2018-11-05 10:22:07 +0000 |
|---|---|---|
| committer | Gitea <gitea@fake.local> | 2018-11-05 10:22:07 +0000 |
| commit | a6b8d736767931f60f4adac30062816c387a4ad2 (patch) | |
| tree | 67a8d1b75b1e005dcdb065f6b46be8145a57e9d1 | |
| parent | eae23dc582b2959c282c50ce5899298fe15c0179 (diff) | |
| parent | 394cd33f76f40ba9e8e231180e1bb397cd91c131 (diff) | |
| download | asp32-a6b8d736767931f60f4adac30062816c387a4ad2.tar.xz | |
Merge branch 'exp/upstream' of euler271/asp32 into master
| -rw-r--r-- | asp32.in | 14 | ||||
| -rw-r--r-- | package.inc.sh | 2 | ||||
| -rw-r--r-- | util.inc.sh | 1 |
3 files changed, 9 insertions, 8 deletions
@@ -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}" } |