chore: Improve error message when no JAVA_MAIN_CLASS and no JAVA_APP_…

…JAR is given (#74)
fabric8io-images · Jan 14, 2019 · e6b7074 · e6b7074
1 parent 94433e1
commit e6b7074
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/fish-pepper/run-java-sh/fp-files/run-java.sh b/fish-pepper/run-java-sh/fp-files/run-java.sh
@@ -587,11 +587,11 @@ run() {
   cd ${JAVA_APP_DIR}
   if [ -n "${JAVA_MAIN_CLASS:-}" ] ; then
      args="${JAVA_MAIN_CLASS}"
-  else
-     # Either JAVA_MAIN_CLASS or JAVA_APP_JAR has been set in load_env()
-     # So no ${JAVA_APP_JAR:-} safeguard is needed here. Actually its good when the script
-     # dies here if JAVA_APP_JAR would not be set for some reason (see option `set -u` above)
+  elif [ -n "${JAVA_APP_JAR:-}" ]; then
      args="-jar ${JAVA_APP_JAR}"
+  else
+     echo "Either JAVA_MAIN_CLASS or JAVA_APP_JAR needs to be given"
+     exit 1
   fi
   # Don't put ${args} in quotes, otherwise it would be interpreted as a single arg.
   # However it could be two args (see above). zsh doesn't like this btw, but zsh is not