Remove redundant variable in configure-liberty.sh

WASdev · May 31, 2023 · 70b28de · 70b28de
1 parent 2204c3e
commit 70b28de
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 8 deletions.
diff --git a/ga/22.0.0.12/kernel/helpers/build/configure-liberty.sh b/ga/22.0.0.12/kernel/helpers/build/configure-liberty.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 
 OPT_PREFIX="/opt/ibm"
-ORIGINAL_WLP_OUTPUT_DIR="$OPT_PREFIX/wlp/output"
 ORIGINAL_SERVER_NAME="defaultServer"
 IS_KERNEL=false
 
@@ -34,7 +33,7 @@ if [ "$SERVER_NAME" != "$ORIGINAL_SERVER_NAME" ] && [ -d "$OPT_PREFIX/wlp/usr/se
 
   # Add new output folder symlink and resolve group write permissions
   SERVER_OUTPUT_DIR=$WLP_OUTPUT_DIR/$SERVER_NAME
-  ORIGINAL_SERVER_OUTPUT_DIR=$ORIGINAL_WLP_OUTPUT_DIR/$ORIGINAL_SERVER_NAME
+  ORIGINAL_SERVER_OUTPUT_DIR=$WLP_OUTPUT_DIR/$ORIGINAL_SERVER_NAME
   mkdir -p $SERVER_OUTPUT_DIR
   ln -s $SERVER_OUTPUT_DIR $OPT_PREFIX/links/output
 

diff --git a/ga/23.0.0.3/kernel/helpers/build/configure-liberty.sh b/ga/23.0.0.3/kernel/helpers/build/configure-liberty.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 
 OPT_PREFIX="/opt/ibm"
-ORIGINAL_WLP_OUTPUT_DIR="$OPT_PREFIX/wlp/output"
 ORIGINAL_SERVER_NAME="defaultServer"
 IS_KERNEL=false
 
@@ -34,7 +33,7 @@ if [ "$SERVER_NAME" != "$ORIGINAL_SERVER_NAME" ] && [ -d "$OPT_PREFIX/wlp/usr/se
 
   # Add new output folder symlink and resolve group write permissions
   SERVER_OUTPUT_DIR=$WLP_OUTPUT_DIR/$SERVER_NAME
-  ORIGINAL_SERVER_OUTPUT_DIR=$ORIGINAL_WLP_OUTPUT_DIR/$ORIGINAL_SERVER_NAME
+  ORIGINAL_SERVER_OUTPUT_DIR=$WLP_OUTPUT_DIR/$ORIGINAL_SERVER_NAME
   mkdir -p $SERVER_OUTPUT_DIR
   ln -s $SERVER_OUTPUT_DIR $OPT_PREFIX/links/output
 

diff --git a/ga/23.0.0.4/kernel/helpers/build/configure-liberty.sh b/ga/23.0.0.4/kernel/helpers/build/configure-liberty.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 
 OPT_PREFIX="/opt/ibm"
-ORIGINAL_WLP_OUTPUT_DIR="$OPT_PREFIX/wlp/output"
 ORIGINAL_SERVER_NAME="defaultServer"
 IS_KERNEL=false
 
@@ -34,7 +33,7 @@ if [ "$SERVER_NAME" != "$ORIGINAL_SERVER_NAME" ] && [ -d "$OPT_PREFIX/wlp/usr/se
 
   # Add new output folder symlink and resolve group write permissions
   SERVER_OUTPUT_DIR=$WLP_OUTPUT_DIR/$SERVER_NAME
-  ORIGINAL_SERVER_OUTPUT_DIR=$ORIGINAL_WLP_OUTPUT_DIR/$ORIGINAL_SERVER_NAME
+  ORIGINAL_SERVER_OUTPUT_DIR=$WLP_OUTPUT_DIR/$ORIGINAL_SERVER_NAME
   mkdir -p $SERVER_OUTPUT_DIR
   ln -s $SERVER_OUTPUT_DIR $OPT_PREFIX/links/output
 

diff --git a/ga/latest/kernel/helpers/build/configure-liberty.sh b/ga/latest/kernel/helpers/build/configure-liberty.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 
 OPT_PREFIX="/opt/ibm"
-ORIGINAL_WLP_OUTPUT_DIR="$OPT_PREFIX/wlp/output"
 ORIGINAL_SERVER_NAME="defaultServer"
 IS_KERNEL=false
 
@@ -34,7 +33,7 @@ if [ "$SERVER_NAME" != "$ORIGINAL_SERVER_NAME" ] && [ -d "$OPT_PREFIX/wlp/usr/se
 
   # Add new output folder symlink and resolve group write permissions
   SERVER_OUTPUT_DIR=$WLP_OUTPUT_DIR/$SERVER_NAME
-  ORIGINAL_SERVER_OUTPUT_DIR=$ORIGINAL_WLP_OUTPUT_DIR/$ORIGINAL_SERVER_NAME
+  ORIGINAL_SERVER_OUTPUT_DIR=$WLP_OUTPUT_DIR/$ORIGINAL_SERVER_NAME
   mkdir -p $SERVER_OUTPUT_DIR
   ln -s $SERVER_OUTPUT_DIR $OPT_PREFIX/links/output