reformat-shell.sh: Add --simplify argument

And apply the changes.

Change-Id: Id4d04bebdb8b2cb56e8dd16a386c41fdb95c0413
Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
Acked-by: Razvan Cojocaru <razvanc@mailbox.org>
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1794
Message-Id: <20260820091615.4656-1-gert@greenie.muc.de>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg38548.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>

Author: flichtenheld

dev-tools/reformat-shell.sh

@@ -5,7 +5,7 @@
 
 set -u
 
-FORMAT_ARGS="--indent=4 --func-next-line --case-indent"
+FORMAT_ARGS="--simplify --indent=4 --func-next-line --case-indent"
 FORMAT_CMD="shfmt --list --write"
 
 # hardcoded to --posix due to .in filename and invalid shebang

tests/t_client.sh.in

@@ -155,7 +155,7 @@ output()
 fail()
 {
     output "FAIL: $@\n"
-    fail_count=$(($fail_count + 1))
+    fail_count=$((fail_count + 1))
 }
 
 # print "all interface IP addresses" + "all routes"
@@ -386,7 +386,7 @@ for SUF in $TEST_RUN_LIST; do
             ovpn_init_check=0
             ovpn_init_success=1
         fi
-        ovpn_init_check=$(($ovpn_init_check - 1))
+        ovpn_init_check=$((ovpn_init_check - 1))
     done
 
     opid=$(cat $pidfile)

tests/t_lpback.sh

@@ -59,13 +59,13 @@ test_end()
                 ;;
         esac
         e=1
-        tests_failed=$(($tests_failed + 1))
+        tests_failed=$((tests_failed + 1))
     else
         case $V in
             0 | 1) ;;       # no per-test output for 'OK'
             *) echo "OK" ;; # print all
         esac
-        tests_passed=$(($tests_passed + 1))
+        tests_passed=$((tests_passed + 1))
     fi
 }
 

tests/t_net.sh

@@ -162,7 +162,7 @@ done
 # remove interface for good
 $RUN_SUDO ip link del $IFACE
 
-for i in $(seq $(($LAST_AUTO_TEST + 1)) ${LAST_TEST}); do
+for i in $(seq $((LAST_AUTO_TEST + 1)) ${LAST_TEST}); do
     $RUN_SUDO $UNIT_TEST $i
     if [ $? -ne 0 ]; then
         echo "unit-test $i errored out"

tests/t_server_null_client.sh

@@ -164,7 +164,7 @@ while [ $count -lt $server_max_wait ]; do
             continue
         fi
         if $RUN_SUDO kill -0 $server_pid >/dev/null 2>&1; then
-            servers_up=$(($servers_up + 1))
+            servers_up=$((servers_up + 1))
         fi
     done