diff --git a/backend/scripts/run.template.sh b/backend/scripts/run.template.sh index 33c8eda2e..acc2212cf 100644 --- a/backend/scripts/run.template.sh +++ b/backend/scripts/run.template.sh @@ -1,19 +1,21 @@ #!/usr/bin/env bash -set +e -JAVA_CMD=$(type -p java) -set -e if [[ ! -n "$JAVA_CMD" ]]; then - if [[ -n "$JAVA_HOME" ]] && [[ -x "$JAVA_HOME/bin/java" ]]; then - JAVA_CMD="$JAVA_HOME/bin/java" - else - >&2 echo "Couldn't find 'java'. Please set JAVA_HOME." - exit 1 - fi + if [[ -n "$JAVA_HOME" ]] && [[ -x "$JAVA_HOME/bin/java" ]]; then + JAVA_CMD="$JAVA_HOME/bin/java" + else + set +e + JAVA_CMD=$(type -p java) + set -e + if [[ ! -n "$JAVA_CMD" ]]; then + >&2 echo "Couldn't find 'java'. Please set JAVA_HOME." + exit 1 + fi + fi fi if [ -f ./environ ]; then - source ./environ + source ./environ fi set -x