Fix return code handling

Author: Josh-Matsuoka

modules/jlink/artifacts/opt/jboss/container/java/jlink/mkdeps.sh

@@ -21,10 +21,7 @@ function generate_deps() {
         --module-path dependencies \
         "$JAVA_APP_JAR" \
         "$JAVA_LIB_DIR"/**/*.jar \
-        > deps.txt || {
-        echo "jdeps failed: return code $?"
-        exit $?
-      }
+        > deps.txt
   else 
     $JAVA_HOME/bin/jdeps --multi-release $JAVA_VERSION -R -s \
       --module-path dependencies \

modules/s2i/bash/artifacts/usr/local/s2i/assemble

@@ -28,29 +28,29 @@ if [ "$S2I_ENABLE_JLINK" = "true" ]; then
     source "${JBOSS_CONTAINER_JAVA_JLINK_MODULE}/mkdeps.sh"
     echo "Invoking mkdeps"
     generate_deps || {
-        log_error "mkdeps failed, return code: $1"
-        exit $1
+        log_error "mkdeps failed, return code: $?"
+        exit 1
     }
 
     source "${JBOSS_CONTAINER_JAVA_JLINK_MODULE}/mkstrippeddeps.sh"
     echo "Stripping dependencies"
     mkstrippeddeps || {
-        log_error "stripping dependencies failed, return code: $1"
-        exit $1
+        log_error "stripping dependencies failed, return code: $?"
+        exit 1
     }
 
     source "${JBOSS_CONTAINER_JAVA_JLINK_MODULE}/generatejdkdeps.sh"
     echo "Generating JDK dependencies"
     generatejdkdeps || {
-        log_error "generating JDK dependencies failed, return code: $1"
-        exit $1
+        log_error "generating JDK dependencies failed, return code: $?"
+        exit 1
     }
 
     source "${JBOSS_CONTAINER_JAVA_JLINK_MODULE}/mkjreimage.sh"
     echo "Linking jre"
     generate_jre_image || {
-        log_error "Linking JRE failed, return code: $1"
-        exit $1
+        log_error "Linking JRE failed, return code: $?"
+        exit 1
     }
 
 fi