Define WLP_INSTALL_DIR in utils.sh

Author: kabicin

releases/latest/beta/helpers/build/configure.sh

@@ -6,7 +6,6 @@ set -Eeo pipefail
 
 function main() {
   ##Define variables for XML snippets source and target paths
-  WLP_INSTALL_DIR=/opt/ol/wlp
   SHARED_CONFIG_DIR=${WLP_INSTALL_DIR}/usr/shared/config
   SHARED_RESOURCE_DIR=${WLP_INSTALL_DIR}/usr/shared/resources
 
@@ -93,7 +92,7 @@ function main() {
   # Apply interim fixes found in /opt/ol/fixes
   # Fixes recommended by IBM, such as to resolve security vulnerabilities, are also included in /opt/ol/fixes
   # Note: This step should be done once needed features are enabled and installed.
-  find /opt/ol/fixes -type f -name "*.jar"  -print0 | sort -z | xargs -0 -n 1 -r -I {} java -jar {} --installLocation $WLP_INSTALL_DIR
+  installFixes
 
   # Force the server.xml to be processed by updating its timestamp
   touch /config/server.xml

releases/latest/full/helpers/build/configure.sh

@@ -6,7 +6,6 @@ set -Eeo pipefail
 
 function main() {
   ##Define variables for XML snippets source and target paths
-  WLP_INSTALL_DIR=/opt/ol/wlp
   SHARED_CONFIG_DIR=${WLP_INSTALL_DIR}/usr/shared/config
   SHARED_RESOURCE_DIR=${WLP_INSTALL_DIR}/usr/shared/resources
 
@@ -93,7 +92,7 @@ function main() {
   # Apply interim fixes found in /opt/ol/fixes
   # Fixes recommended by IBM, such as to resolve security vulnerabilities, are also included in /opt/ol/fixes
   # Note: This step should be done once needed features are enabled and installed.
-  find /opt/ol/fixes -type f -name "*.jar"  -print0 | sort -z | xargs -0 -n 1 -r -I {} java -jar {} --installLocation $WLP_INSTALL_DIR
+  installFixes
 
   # Force the server.xml to be processed by updating its timestamp
   touch /config/server.xml

releases/latest/kernel-slim/helpers/build/configure.sh

@@ -6,7 +6,6 @@ set -Eeo pipefail
 
 function main() {
   ##Define variables for XML snippets source and target paths
-  WLP_INSTALL_DIR=/opt/ol/wlp
   SHARED_CONFIG_DIR=${WLP_INSTALL_DIR}/usr/shared/config
   SHARED_RESOURCE_DIR=${WLP_INSTALL_DIR}/usr/shared/resources
 

releases/latest/kernel-slim/helpers/build/internal/utils.sh

@@ -1,6 +1,8 @@
 #!/bin/bash
 
 function main() {
+    WLP_TYPE=ol
+    WLP_INSTALL_DIR=/opt/$WLP_TYPE/wlp
     if [ "$VERBOSE" != "true" ]; then
         exec >/dev/null
     fi
@@ -16,7 +18,7 @@ function showLogs() {
 
 function installFixes() {
     if [ ! -f "/logs/fixes.log" ]; then
-        find /opt/ol/fixes -type f -name "*.jar"  -print0 | sort -z | xargs -0 -r -I {} java -jar {} --installLocation $WLP_INSTALL_DIR
+        find /opt/$WLP_TYPE/fixes -type f -name "*.jar"  -print0 | sort -z | xargs -0 -n 1 -r -I {} java -jar {} --installLocation $WLP_INSTALL_DIR
         echo "installFixes has been run" > /logs/fixes.log
     fi 
 }