[OPENJDK-2737] gate jlink calls behind S2I_ENABLE_JLINK

Ensure that S2I_ENABLE_JLINK=true before evaluating any of the
jlink integration code.

https://issues.redhat.com/browse/OPENJDK-2737

Signed-off-by: Jonathan Dowland <[email protected]>

Author: jmtd

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

@@ -19,18 +19,22 @@ source "${JBOSS_CONTAINER_UTIL_PATHFINDER_MODULE}/pathfinder.sh"
 setup_java_app_and_lib
 
 # include our jlink scripts
-source "${JBOSS_CONTAINER_JAVA_JLINK_MODULE}/mkdeps.sh"
-echo "Invoking mkdeps"
-generate_deps
+if [ "$S2I_ENABLE_JLINK" = "true" ]; then
 
-source "${JBOSS_CONTAINER_JAVA_JLINK_MODULE}/mkstrippeddeps.sh"
-echo "Stripping dependencies"
-mkstrippeddeps
+    source "${JBOSS_CONTAINER_JAVA_JLINK_MODULE}/mkdeps.sh"
+    echo "Invoking mkdeps"
+    generate_deps
 
-source "${JBOSS_CONTAINER_JAVA_JLINK_MODULE}/generatejdkdeps.sh"
-echo "Generating JDK dependencies"
-generatejdkdeps
+    source "${JBOSS_CONTAINER_JAVA_JLINK_MODULE}/mkstrippeddeps.sh"
+    echo "Stripping dependencies"
+    mkstrippeddeps
 
-source "${JBOSS_CONTAINER_JAVA_JLINK_MODULE}/mkjreimage.sh"
-echo "Linking jre"
-generate_jre_image
+    source "${JBOSS_CONTAINER_JAVA_JLINK_MODULE}/generatejdkdeps.sh"
+    echo "Generating JDK dependencies"
+    generatejdkdeps
+
+    source "${JBOSS_CONTAINER_JAVA_JLINK_MODULE}/mkjreimage.sh"
+    echo "Linking jre"
+    generate_jre_image
+
+fi