From 64d48b2d908ed033797783d21c37a0a119d07f42 Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Thu, 30 Mar 2023 08:00:00 +0000 Subject: treewide: fix unnecessary $ on arithmetic variables This silences shellcheck SC2004. --- attic/qemu_multiarch_testing/make-hdc-img.sh | 2 +- ci/run-build-and-tests.sh | 4 ++-- maint/ioctls_sym.sh | 2 +- maint/update_copyright_years.sh | 4 ++-- strace.spec.in | 2 +- tests/detach-sleeping.test | 2 +- tests/detach-stopped.test | 2 +- tests/init.sh | 6 +++--- tests/kill_child.test | 2 +- tests/looping_threads.test | 10 +++++----- tests/qual_inject-syntax.test | 2 +- tests/qualify_personality.sh | 2 +- tests/qualify_personality_all.sh | 2 +- tests/readv.test | 6 +++--- tests/status-none-threads.test | 2 +- tests/strace-DD.test | 4 ++-- tests/strace-t.test | 2 +- tests/strace-tt.test | 2 +- tests/strace-ttt.test | 2 +- tests/threads-execve.test | 2 +- 20 files changed, 31 insertions(+), 31 deletions(-) diff --git a/attic/qemu_multiarch_testing/make-hdc-img.sh b/attic/qemu_multiarch_testing/make-hdc-img.sh index 1c740ba08..f7fce90a0 100755 --- a/attic/qemu_multiarch_testing/make-hdc-img.sh +++ b/attic/qemu_multiarch_testing/make-hdc-img.sh @@ -21,7 +21,7 @@ size=$(du -ks hdc.dir | sed -En 's/^([0-9]+).*/\1/p') [ "$size" -gt 0 ] rm -f hdc.img -dd if=/dev/zero of=hdc.img count=1 bs=1024 seek=$(($size*2)) +dd if=/dev/zero of=hdc.img count=1 bs=1024 seek=$((size*2)) mkfs.ext3 -q -F -b 1024 -i 4096 hdc.img tune2fs -c 0 -i 0 hdc.img mkdir hdc.img.dir diff --git a/ci/run-build-and-tests.sh b/ci/run-build-and-tests.sh index 0baa32baa..87a4ea0cf 100755 --- a/ci/run-build-and-tests.sh +++ b/ci/run-build-and-tests.sh @@ -66,7 +66,7 @@ make --version |head -1 autoconf --version |head -1 automake --version |head -1 kver="$(printf '%s\n%s\n' '#include ' 'LINUX_VERSION_CODE' | $CC $CPPFLAGS -E -P -)" -printf 'kernel-headers %s.%s.%s\n' $(($kver/65536)) $(($kver/256%256)) $(($kver%256)) +printf 'kernel-headers %s.%s.%s\n' $((kver/65536)) $((kver/256%256)) $((kver%256)) echo 'END OF BUILD ENVIRONMENT INFORMATION' export CC_FOR_BUILD="$CC" @@ -85,7 +85,7 @@ export CC_FOR_BUILD="$CC" nproc="$(nproc)" || nproc=1 j="-j$nproc" -j2="-j$((2*$nproc))" +j2="-j$((2*nproc))" case "${CHECK-}" in coverage) diff --git a/maint/ioctls_sym.sh b/maint/ioctls_sym.sh index 71b6a1c3d..48c09c469 100755 --- a/maint/ioctls_sym.sh +++ b/maint/ioctls_sym.sh @@ -478,7 +478,7 @@ while read f; do (process_file "$f" < /dev/null) [ $? -eq 0 ] || { msg "$f: failed to process" - failed=$((1 + $failed)) + failed=$((1 + failed)) } done < "$tmpdir"/headers.list diff --git a/maint/update_copyright_years.sh b/maint/update_copyright_years.sh index d48a6e1b0..0c866fa13 100755 --- a/maint/update_copyright_years.sh +++ b/maint/update_copyright_years.sh @@ -175,10 +175,10 @@ MAX_JOBS="$(getconf _NPROCESSORS_ONLN)" while [ -n "${1-}" ]; do case "$1" in "-v") - VERBOSE=$(($VERBOSE + 1)) + VERBOSE=$((VERBOSE + 1)) ;; "-q") - VERBOSE=$(($VERBOSE - 1)) + VERBOSE=$((VERBOSE - 1)) ;; "-h") print_help diff --git a/strace.spec.in b/strace.spec.in index 280b31f03..bea8d8255 100644 --- a/strace.spec.in +++ b/strace.spec.in @@ -81,7 +81,7 @@ file -L /bin/sh gcc --version |head -1 ld --version |head -1 kver="$(printf '%%s\n%%s\n' '#include ' 'LINUX_VERSION_CODE' | gcc -E -P -)" -printf 'kernel-headers %%s.%%s.%%s\n' $(($kver/65536)) $(($kver/256%%256)) $(($kver%%256)) +printf 'kernel-headers %%s.%%s.%%s\n' $((kver/65536)) $((kver/256%%256)) $((kver%%256)) echo 'END OF BUILD ENVIRONMENT INFORMATION' CFLAGS_FOR_BUILD="$RPM_OPT_FLAGS"; export CFLAGS_FOR_BUILD diff --git a/tests/detach-sleeping.test b/tests/detach-sleeping.test index bc9fdde78..a5fdedb09 100755 --- a/tests/detach-sleeping.test +++ b/tests/detach-sleeping.test @@ -23,7 +23,7 @@ expected_rc=$? set -e -../set_ptracer_any sleep $((2*$TIMEOUT_DURATION)) > "$LOG" & +../set_ptracer_any sleep $((2*TIMEOUT_DURATION)) > "$LOG" & while ! [ -s "$LOG" ]; do kill -0 $! 2> /dev/null || diff --git a/tests/detach-stopped.test b/tests/detach-stopped.test index 2c17a43ea..058fb6a1a 100755 --- a/tests/detach-stopped.test +++ b/tests/detach-stopped.test @@ -25,7 +25,7 @@ expected_rc=$? set -e > "$LOG" -../set_ptracer_any sleep $((2*$TIMEOUT_DURATION)) > "$LOG" & +../set_ptracer_any sleep $((2*TIMEOUT_DURATION)) > "$LOG" & while ! [ -s "$LOG" ]; do kill -0 $! 2> /dev/null || diff --git a/tests/init.sh b/tests/init.sh index d8737bf9b..a626b92b8 100644 --- a/tests/init.sh +++ b/tests/init.sh @@ -67,7 +67,7 @@ print_current_personality_designator() if [ 'x32' = "$STRACE_NATIVE_ARCH" ]; then echo x32 else - echo "$(($SIZEOF_LONG * 8))" + echo "$((SIZEOF_LONG * 8))" fi else [ 4 -eq "$SIZEOF_LONG" ] || @@ -262,7 +262,7 @@ match_grep() } printf '#%d: %s\n' "$cnt" "$pattern" } - cnt=$(($cnt + 1)) + cnt=$((cnt + 1)) done < "$patterns" || fail_ "Error reading patterns from \"$patterns\"" test -z "$failed" || { @@ -343,7 +343,7 @@ kernel_version_code() v1="${1%%[!0-9]*}" && [ -n "$v1" ] || v1=0 v2="${2%%[!0-9]*}" && [ -n "$v2" ] || v2=0 v3="${3%%[!0-9]*}" && [ -n "$v3" ] || v3=0 - echo "$(($v1 * 65536 + $v2 * 256 + $v3))" + echo "$((v1 * 65536 + v2 * 256 + v3))" ) } diff --git a/tests/kill_child.test b/tests/kill_child.test index 21c73869f..58f5d826a 100755 --- a/tests/kill_child.test +++ b/tests/kill_child.test @@ -25,7 +25,7 @@ while :; do grep -q '^[1-9][0-9]* <\.\.\. ??? resumed>) \+= ?$' "$LOG" && exit 0 s1="$(date +%s)" - if [ "$(($s1-$s0))" -gt "$(($TIMEOUT_DURATION/2))" ]; then + if [ "$((s1-s0))" -gt "$((TIMEOUT_DURATION/2))" ]; then skip_ 'Unable to reproduce <... ??? resumed>' fi done diff --git a/tests/looping_threads.test b/tests/looping_threads.test index 3e5d3ba9c..7e5f11a3b 100755 --- a/tests/looping_threads.test +++ b/tests/looping_threads.test @@ -19,8 +19,8 @@ check_prog nproc inc="$(nproc)" [ "$inc" -ge 1 ] || inc=1 -timeout_2="$(($TIMEOUT_DURATION/2))" -timeout_16="$(($TIMEOUT_DURATION/16))" +timeout_2="$((TIMEOUT_DURATION/2))" +timeout_16="$((TIMEOUT_DURATION/16))" nproc=1 run_prog "../$NAME" "$timeout_16" "$nproc" @@ -29,10 +29,10 @@ while :; do run_strace --follow-forks -qq -enone -esignal=none "../$NAME" "$timeout_2" "$nproc" s1="$(date +%s)" - [ "$(($s1-$s0))" -lt "$timeout_16" ] || + [ "$((s1-s0))" -lt "$timeout_16" ] || break - nproc="$(($nproc+$inc))" + nproc="$((nproc+inc))" done -warn_ "$ME_: nproc=$nproc elapsed=$(($s1-$s0))" +warn_ "$ME_: nproc=$nproc elapsed=$((s1-s0))" diff --git a/tests/qual_inject-syntax.test b/tests/qual_inject-syntax.test index 3ba9f4c5c..d7c086538 100755 --- a/tests/qual_inject-syntax.test +++ b/tests/qual_inject-syntax.test @@ -10,7 +10,7 @@ . "${srcdir=.}/init.sh" -zeroes=; i=0; while [ $i -lt 2050 ]; do zeroes="0$zeroes"; i=$(($i+1)); done +zeroes=; i=0; while [ $i -lt 2050 ]; do zeroes="0$zeroes"; i=$((i+1)); done # # F diff --git a/tests/qualify_personality.sh b/tests/qualify_personality.sh index eea513362..1bcfc1511 100644 --- a/tests/qualify_personality.sh +++ b/tests/qualify_personality.sh @@ -29,7 +29,7 @@ aarch64|powerpc64|s390x|sparc64|tile) supported_pers='64 32' ;; *) - supported_pers="$(($SIZEOF_LONG * 8))" + supported_pers="$((SIZEOF_LONG * 8))" ;; esac diff --git a/tests/qualify_personality_all.sh b/tests/qualify_personality_all.sh index d3fc95253..5e62710e9 100644 --- a/tests/qualify_personality_all.sh +++ b/tests/qualify_personality_all.sh @@ -31,7 +31,7 @@ aarch64|powerpc64|s390x|sparc64|tile) supported_pers='64 32' ;; *) - native_pers=$(($SIZEOF_LONG * 8)) + native_pers=$((SIZEOF_LONG * 8)) supported_pers=$native_pers ;; esac diff --git a/tests/readv.test b/tests/readv.test index aa067be09..9b672a8d8 100755 --- a/tests/readv.test +++ b/tests/readv.test @@ -20,7 +20,7 @@ run_strace_match_diff -a16 -e trace=readv,writev \ -eread='!all' -ewrite=none -eread='!0,1,2' -ewrite='!0,1,2' wfd="$(../print_maxfd)" -rfd="$(($wfd - 1))" +rfd="$((wfd - 1))" run_strace_match_diff -a16 -e trace=readv,writev \ -eread="$rfd" -ewrite="$wfd" run_strace_match_diff -a16 -e trace=readv,writev \ @@ -31,7 +31,7 @@ rfds='!!!0' i=0 while [ $i -lt $rfd ]; do rfds="$rfds,$i" - i=$(($i + 1)) + i=$((i + 1)) done wfds='!!!0' @@ -39,7 +39,7 @@ wfds='!!!0' i=0 while [ $i -lt $wfd ]; do wfds="$wfds,$i" - i=$(($i + 1)) + i=$((i + 1)) done run_strace_match_diff -a16 -e trace=readv,writev \ diff --git a/tests/status-none-threads.test b/tests/status-none-threads.test index 630424e8a..d470dc48d 100755 --- a/tests/status-none-threads.test +++ b/tests/status-none-threads.test @@ -38,7 +38,7 @@ while :; do fi s1="$(date +%s)" - [ "$(($s1-$s0))" -gt "$(($TIMEOUT_DURATION/2))" ] || + [ "$((s1-s0))" -gt "$((TIMEOUT_DURATION/2))" ] || continue [ "$rc" = 0 ] && diff --git a/tests/strace-DD.test b/tests/strace-DD.test index 713583836..c8517e69f 100755 --- a/tests/strace-DD.test +++ b/tests/strace-DD.test @@ -25,7 +25,7 @@ get_tracer_pid() run_prog ../sleep 0 -sleep_duration="$(($TIMEOUT_DURATION/2))" +sleep_duration="$((TIMEOUT_DURATION/2))" test_D() { @@ -49,7 +49,7 @@ test_D() kill -$sig -$tracee_pid wait $tracee_pid && rc=0 || rc=$? - [ "$rc" -eq $((128 + $sig)) ] || + [ "$rc" -eq $((128 + sig)) ] || dump_log_and_fail_with \ "$* failed with unexpected exit status $rc" diff --git a/tests/strace-t.test b/tests/strace-t.test index 4d79a2d9a..f837ba98d 100755 --- a/tests/strace-t.test +++ b/tests/strace-t.test @@ -24,7 +24,7 @@ t_reg= while [ "$s" -le "$s1" ]; do t="$(date +%T --date "@$s")" [ -z "$t_reg" ] && t_reg="$t" || t_reg="$t_reg|$t" - s=$(($s + 1)) + s=$((s + 1)) done t_reg="($t_reg)" diff --git a/tests/strace-tt.test b/tests/strace-tt.test index 17d87d673..afdb52013 100755 --- a/tests/strace-tt.test +++ b/tests/strace-tt.test @@ -26,7 +26,7 @@ t_reg= while [ "$s" -le "$s1" ]; do t="$(date +%T --date "@$s")" [ -z "$t_reg" ] && t_reg="$t" || t_reg="$t_reg|$t" - s=$(($s + 1)) + s=$((s + 1)) done cat > "$EXP" << __EOF__ diff --git a/tests/strace-ttt.test b/tests/strace-ttt.test index 2578d874a..7794d3327 100755 --- a/tests/strace-ttt.test +++ b/tests/strace-ttt.test @@ -24,7 +24,7 @@ s="$s0" t_reg= while [ "$s" -le "$s1" ]; do [ -z "$t_reg" ] && t_reg="$s" || t_reg="$t_reg|$s" - s=$(($s + 1)) + s=$((s + 1)) done if [ x0 = "x${precision}" ]; then diff --git a/tests/threads-execve.test b/tests/threads-execve.test index 5048a06a1..0dbb57be9 100755 --- a/tests/threads-execve.test +++ b/tests/threads-execve.test @@ -33,7 +33,7 @@ while :; do sed 1d < "$LOG" > "$OUT" diff -- "$EXP" "$OUT" && exit 0 s1="$(date +%s)" - if [ "$(($s1-$s0))" -gt "$(($TIMEOUT_DURATION/2))" ]; then + if [ "$((s1-s0))" -gt "$((TIMEOUT_DURATION/2))" ]; then fail_ "$STRACE $* output mismatch" fi done -- cgit v1.2.1