diff options
| author | Jakub Jirutka <jakub@jirutka.cz> | 2022-11-06 20:07:59 +0100 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2022-11-06 20:07:59 +0100 |
| commit | 462826ff1fc387dc642f1670a68cddc6f0b6cc29 (patch) | |
| tree | bddb1c5902819732819364f46fd788f8a6bc52fd /setup-apkrepos.in | |
| parent | 3da4ed314aeebd403410deaf189d5921cc654c6c (diff) | |
| download | alpine-conf-462826ff1fc387dc642f1670a68cddc6f0b6cc29.zip | |
always quote vars in 'local' assignment
Some shells may apply word splitting after expanding variable in
`local a=$1`. I know just about yash, but since `local` is supposed to
be a builtin *command*, the "correct" behaviour of common shells is
actually a special case for `local` - it doesn't apply for other
commands. See https://osdn.net/projects/yash/ticket/46041.
Diffstat (limited to 'setup-apkrepos.in')
| -rw-r--r-- | setup-apkrepos.in | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/setup-apkrepos.in b/setup-apkrepos.in index 488a9f0..bb60132 100644 --- a/setup-apkrepos.in +++ b/setup-apkrepos.in @@ -12,7 +12,7 @@ if [ "$ROOT" != "/" ]; then fi get_hostname_from_url() { - local n=${1#*://} + local n="${1#*://}" echo ${n%%/*} } @@ -28,7 +28,7 @@ ask_setup_method() { add_random_mirror() { local i=0 - local random_mirror_index=$(( $RANDOM % $mirror_count )) + local random_mirror_index="$(( $RANDOM % $mirror_count ))" printf %s "Picking random mirror... " for mirror in $MIRRORS; do @@ -41,7 +41,7 @@ add_random_mirror() { } time_cmd() { - local start=$(cut -d ' ' -f1 /proc/uptime) + local start="$(cut -d ' ' -f1 /proc/uptime)" $@ >&2 || return awk -v start=$start -v end=$(cut -d ' ' -f1 /proc/uptime) \ 'BEGIN {print end - start; exit}' @@ -49,12 +49,12 @@ time_cmd() { find_fastest_mirror() { local url= - local arch=$(apk --print-arch) + local arch="$(apk --print-arch)" for url in $MIRRORS; do # warm up the dns cache nslookup $(get_hostname_from_url $url) >/dev/null 2>&1 - local time=$(time_cmd wget --spider -q -T 5 -t 1 \ - ${url%/}/edge/main/$arch/APKINDEX.tar.gz) + local time="$(time_cmd wget --spider -q -T 5 -t 1 \ + ${url%/}/edge/main/$arch/APKINDEX.tar.gz)" if [ -n "$time" ]; then echo "$time $url" fi @@ -63,7 +63,7 @@ find_fastest_mirror() { add_fastest_mirror() { echo "Finding fastest mirror... " - local fastest=$(find_fastest_mirror) + local fastest="$(find_fastest_mirror)" if [ -z "$fastest" ]; then echo "Warning! No mirror found" return 1 @@ -87,7 +87,7 @@ show_mirror_list() { } add_from_list() { - local mirror_index=$1 + local mirror_index="$1" if [ $mirror_index -lt 1 ] || [ $mirror_index -gt $mirror_count ]; then return 1 fi @@ -97,7 +97,7 @@ add_from_list() { } get_alpine_release() { - local version=$(cat "${ROOT}"etc/alpine-release 2>/dev/null) + local version="$(cat "${ROOT}"etc/alpine-release 2>/dev/null)" case "$version" in *_git*|*_alpha*) release="edge";; [0-9]*.[0-9]*.[0-9]*) @@ -130,7 +130,7 @@ add_from_url() { } edit_repositories() { - local md5=$(md5sum $APKREPOS_PATH 2>/dev/null) + local md5="$(md5sum $APKREPOS_PATH 2>/dev/null)" mkdir -p "${APKREPOS_PATH%/*}" ${EDITOR:-vi} "$APKREPOS_PATH" # return true if file changed |