| commit | cf0be4349201f9f2e64b3b1dc4ebe8ae6def9588 | [log] [tgz] |
|---|---|---|
| author | Guillaume Lambert <guillaume.lambert@orange.com> | Thu Apr 29 14:12:24 2021 +0200 |
| committer | Guillaume Lambert <guillaume.lambert@orange.com> | Wed Jun 02 07:52:26 2021 +0000 |
| tree | 5ca34124aae70b4323c31995fec26b3c5e2ae573 | |
| parent | 84b962398213641e656e8d1750b83f480f531563 [diff] [blame] |
[COMMON] Get rid of "x-hack" in shell scripts $ find . -name *.sh -print |xargs grep -l '"x'| xargs sed -i 's/"x/"/g' The "x-hack" is a historical workaround for some old UNIX shells with buggy condition comparison code. None of them is still used today. Recent POSIX specifications now guarantee it should work without it in any modern POSIX shell. More details at https://www.vidarholen.net/contents/blog/?p=1035 https://github.com/koalaman/shellcheck/wiki/SC2268 Issue-ID: OOM-2643 Signed-off-by: Guillaume Lambert <guillaume.lambert@orange.com> Change-Id: Ic01bbc5faee9492dba5b5d4dea0f659540da2c24
diff --git a/kubernetes/so/resources/config/docker-files/scripts/start-jboss-server.sh b/kubernetes/so/resources/config/docker-files/scripts/start-jboss-server.sh index 52ba27d..3a9ef84 100755 --- a/kubernetes/so/resources/config/docker-files/scripts/start-jboss-server.sh +++ b/kubernetes/so/resources/config/docker-files/scripts/start-jboss-server.sh
@@ -37,7 +37,7 @@ trap "kill -QUIT $JBOSS_PID" QUIT trap "kill -PIPE $JBOSS_PID" PIPE trap "kill -TERM $JBOSS_PID" TERM -if [ "x$JBOSS_PIDFILE" != "x" ]; then +if [ "$JBOSS_PIDFILE" != "" ]; then echo $JBOSS_PID > $JBOSS_PIDFILE fi # Wait until the background process exits @@ -60,6 +60,6 @@ # Wait for a complete shudown wait $JBOSS_PID 2>/dev/null fi -if [ "x$JBOSS_PIDFILE" != "x" ]; then +if [ "$JBOSS_PIDFILE" != "" ]; then grep "$JBOSS_PID" $JBOSS_PIDFILE && rm $JBOSS_PIDFILE fi