From 5994d6a559c475c6ee034c9c4fca705291b7c716 Mon Sep 17 00:00:00 2001 From: Patrick McDermott Date: Sat, 16 Mar 2019 16:34:44 -0400 Subject: Add braces to param exps in arith substs --- diff --git a/lib/changelog.sh b/lib/changelog.sh index e7c3f7c..4432850 100644 --- a/lib/changelog.sh +++ b/lib/changelog.sh @@ -81,7 +81,7 @@ ob_parse_changelog() expect='first_heading' while IFS='' read line; do - line_nr=$(($line_nr + 1)) + line_nr=$((${line_nr} + 1)) case "${line}" in '') if [ x"${expect}" = x'start_changes' ]; then diff --git a/lib/control.sh b/lib/control.sh index e43a69e..58827ea 100644 --- a/lib/control.sh +++ b/lib/control.sh @@ -90,7 +90,7 @@ ob_parse_control() line_nr=0 while IFS='' read -r line; do - line_nr=$(($line_nr + 1)) + line_nr=$((${line_nr} + 1)) case "${line}" in '') _ob_parse_control_error "${file}" "${line_nr}" \ @@ -273,7 +273,7 @@ ob_substvars() )" value="$(eval "printf '%s' \"\${_OB_SUBSTVAR_${name}}\"")" string="${lhs}${value}${rhs}" - depth=$(($depth + 1)) + depth=$((${depth} + 1)) done printf '%s\n' "${string}" diff --git a/lib/deps.sh b/lib/deps.sh index d175d44..649cfe0 100644 --- a/lib/deps.sh +++ b/lib/deps.sh @@ -124,7 +124,7 @@ ob_parse_dep() ;; esac done - shift $(($OPTIND - 1)) + shift $((${OPTIND} - 1)) dep="${1}" shift 1 || _ob_abort @@ -232,7 +232,7 @@ ob_reduce_deps() ;; esac done - shift $(($OPTIND - 1)) + shift $((${OPTIND} - 1)) local deps="${1}" shift 1 || _ob_abort diff --git a/lib/metadata.sh b/lib/metadata.sh index 50db700..e3ed407 100644 --- a/lib/metadata.sh +++ b/lib/metadata.sh @@ -107,7 +107,7 @@ ob_parse_version() ;; esac done - shift $(($OPTIND - 1)) + shift $((${OPTIND} - 1)) version="${1}" shift 1 || _ob_abort diff --git a/lib/package.sh b/lib/package.sh index b4a0d97..0c39ca4 100644 --- a/lib/package.sh +++ b/lib/package.sh @@ -108,7 +108,7 @@ ob_get_binary_packages() ;; esac done - shift $(($OPTIND - 1)) + shift $((${OPTIND} - 1)) if ! ${_ob_got_binary_packages}; then diff --git a/src/ob-gencontrol.sh b/src/ob-gencontrol.sh index 943961b..36f1980 100644 --- a/src/ob-gencontrol.sh +++ b/src/ob-gencontrol.sh @@ -42,7 +42,7 @@ gen_control() cut -d ' ' -f 1)" inst_size=0 for size in ${sizes}; do - inst_size=$(($inst_size + $size)) + inst_size=$((${inst_size} + ${size})) done # Convert bytes to kibibytes and round up. # Note: There is an inconsistency between the Debian Policy Manual and opkg @@ -56,7 +56,7 @@ gen_control() # pkg_size_kbs = (pkg->installed_size + 1023)/1024; # TODO: Further investigate opkg's disk space calculation and, if necessary, # patch opkg and submit a bug report. - inst_size=$((($inst_size + 1023) / 1024)) + inst_size=$(((${inst_size} + 1023) / 1024)) mkdir -p -- "${binary}.control" diff --git a/src/opkbuild.sh b/src/opkbuild.sh index af7ce1c..43e338d 100644 --- a/src/opkbuild.sh +++ b/src/opkbuild.sh @@ -381,7 +381,7 @@ main() fi get_options "${@}" || return 1 - shift $(($OPTIND - 1)) + shift $((${OPTIND} - 1)) if [ ${#} -ne 0 ]; then usage return 1 -- cgit v0.9.1