From d96b2204925781e500fc160fedab9ea4d3e5b6b4 Mon Sep 17 00:00:00 2001
From: Robert Patrick <robert.patrick@oracle.com>
Date: Tue, 1 Mar 2022 13:04:33 -0600
Subject: [PATCH] honor existing WLST_EXT_CLASSPATH environemnt variable
 settings when invoking tools

---
 installer/src/main/bin/shared.cmd | 12 ++++++++++--
 installer/src/main/bin/shared.sh  | 11 ++++++++++-
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/installer/src/main/bin/shared.cmd b/installer/src/main/bin/shared.cmd
index 10f09e3d72..7cb03da4ec 100644
--- a/installer/src/main/bin/shared.cmd
+++ b/installer/src/main/bin/shared.cmd
@@ -233,7 +233,11 @@ GOTO :EOF
         EXIT /B 98
       )
       SET CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
-      SET WLST_EXT_CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
+      IF DEFINED WLST_EXT_CLASSPATH (
+        SET "WLST_EXT_CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar;%WLST_EXT_CLASSPATH%"
+      ) ELSE (
+        SET WLST_EXT_CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
+      )
       GOTO found_wlst
     )
 
@@ -243,7 +247,11 @@ GOTO :EOF
     IF EXIST "%ORACLE_HOME%\oracle_common\common\bin\wlst.cmd" (
         SET WLST=%ORACLE_HOME%\oracle_common\common\bin\wlst.cmd
         SET CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
-        SET WLST_EXT_CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
+        IF DEFINED WLST_EXT_CLASSPATH (
+          SET "WLST_EXT_CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar;%WLST_EXT_CLASSPATH%"
+        ) ELSE (
+          SET WLST_EXT_CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
+        )
         GOTO found_wlst
     )
     IF EXIST "%ORACLE_HOME%\wlserver_10.3\common\bin\wlst.cmd" (
diff --git a/installer/src/main/bin/shared.sh b/installer/src/main/bin/shared.sh
index e540b00d83..784c0815e5 100644
--- a/installer/src/main/bin/shared.sh
+++ b/installer/src/main/bin/shared.sh
@@ -194,7 +194,11 @@ runWlst() {
             exit 98
         fi
         CLASSPATH="${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar"; export CLASSPATH
-        WLST_EXT_CLASSPATH="${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar"; export WLST_EXT_CLASSPATH
+        if [ ! -z "${WLST_EXT_CLASSPATH}" ]; then
+          WLST_EXT_CLASSPATH="${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar:${WLST_EXT_CLASSPATH}"; export WLST_EXT_CLASSPATH
+        else
+          WLST_EXT_CLASSPATH="${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar"; export WLST_EXT_CLASSPATH
+        fi
     else
         # if WLST_PATH_DIR was not set, find the WLST executable in one of the known ORACLE_HOME locations.
 
@@ -202,7 +206,12 @@ runWlst() {
         if [ -x "${ORACLE_HOME}/oracle_common/common/bin/wlst.sh" ]; then
             WLST="${ORACLE_HOME}/oracle_common/common/bin/wlst.sh"
             CLASSPATH="${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar"; export CLASSPATH
+          if [ ! -z "${WLST_EXT_CLASSPATH}" ]; then
+            WLST_EXT_CLASSPATH="${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar:${WLST_EXT_CLASSPATH}"
+            export WLST_EXT_CLASSPATH
+          else
             WLST_EXT_CLASSPATH="${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar"; export WLST_EXT_CLASSPATH
+          fi
         elif [ -x "${ORACLE_HOME}/wlserver_10.3/common/bin/wlst.sh" ]; then
             WLST="${ORACLE_HOME}/wlserver_10.3/common/bin/wlst.sh"
             CLASSPATH="${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar"; export CLASSPATH