Attention is currently required from: plaisthos.
Hello plaisthos,
I'd like you to do a code review.
Please visit
http://gerrit.openvpn.net/c/openvpn/+/1794?usp=email
to review the following change.
Change subject: reformat-shell.sh: Add --simplify argument
......................................................................
reformat-shell.sh: Add --simplify argument
And apply the changes.
Change-Id: Id4d04bebdb8b2cb56e8dd16a386c41fdb95c0413
Signed-off-by: Frank Lichtenheld <[email protected]>
---
M dev-tools/reformat-shell.sh
M tests/t_client.sh.in
M tests/t_lpback.sh
M tests/t_net.sh
M tests/t_server_null_client.sh
5 files changed, 7 insertions(+), 7 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/94/1794/1
diff --git a/dev-tools/reformat-shell.sh b/dev-tools/reformat-shell.sh
index a6b8a9a..0502f41 100755
--- a/dev-tools/reformat-shell.sh
+++ b/dev-tools/reformat-shell.sh
@@ -5,7 +5,7 @@
set -u
-FORMAT_ARGS="--indent=4"
+FORMAT_ARGS="--simplify --indent=4"
FORMAT_CMD="shfmt --list --write"
# hardcoded to --posix due to .in filename and invalid shebang
diff --git a/tests/t_client.sh.in b/tests/t_client.sh.in
index 4b6c51d..93762ad 100755
--- a/tests/t_client.sh.in
+++ b/tests/t_client.sh.in
@@ -152,7 +152,7 @@
# print failure message, increase FAIL counter
fail() {
output "FAIL: $@\n"
- fail_count=$(($fail_count + 1))
+ fail_count=$((fail_count + 1))
}
# print "all interface IP addresses" + "all routes"
@@ -380,7 +380,7 @@
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)
diff --git a/tests/t_lpback.sh b/tests/t_lpback.sh
index 8379f8f..0617a30 100755
--- a/tests/t_lpback.sh
+++ b/tests/t_lpback.sh
@@ -57,13 +57,13 @@
;;
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
}
diff --git a/tests/t_net.sh b/tests/t_net.sh
index fbedb54..60da693 100755
--- a/tests/t_net.sh
+++ b/tests/t_net.sh
@@ -160,7 +160,7 @@
# 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"
diff --git a/tests/t_server_null_client.sh b/tests/t_server_null_client.sh
index 2741d5d..81eb138 100755
--- a/tests/t_server_null_client.sh
+++ b/tests/t_server_null_client.sh
@@ -158,7 +158,7 @@
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
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1794?usp=email
To unsubscribe, or for help writing mail filters, visit
http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Id4d04bebdb8b2cb56e8dd16a386c41fdb95c0413
Gerrit-Change-Number: 1794
Gerrit-PatchSet: 1
Gerrit-Owner: flichtenheld <[email protected]>
Gerrit-Reviewer: plaisthos <[email protected]>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]>
_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
