allow spaces in ORACLE_HOME and other environment variables with a path (#900)

allow spaces in ORACLE_HOME

Author: jshum2479

installer/src/main/bin/compareModel.sh

@@ -45,7 +45,6 @@ WLSDEPLOY_PROGRAM_NAME="compareModel"; export WLSDEPLOY_PROGRAM_NAME
 
 scriptName=$(basename "$0")
 scriptPath=$(dirname "$0")
-scriptArgs=$*
 
 . "$scriptPath/shared.sh"
 
@@ -56,4 +55,4 @@ checkJythonArgs "$@"
 # Java 7 is required, no encryption is used
 javaSetup 7
 
-runJython compare_model.py
+runJython compare_model.py "$@"

installer/src/main/bin/createDomain.sh

@@ -109,7 +109,6 @@ WLSDEPLOY_PROGRAM_NAME="createDomain"; export WLSDEPLOY_PROGRAM_NAME
 
 scriptName=$(basename "$0")
 scriptPath=$(dirname "$0")
-scriptArgs=$*
 
 . "$scriptPath/shared.sh"
 
@@ -125,4 +124,4 @@ fi
 # required Java version is dependent on use of encryption
 javaSetup $minJdkVersion
 
-runWlst create.py
+runWlst create.py "$@"

installer/src/main/bin/deployApps.sh

@@ -94,7 +94,6 @@ WLSDEPLOY_PROGRAM_NAME="deployApps"; export WLSDEPLOY_PROGRAM_NAME
 
 scriptName=$(basename "$0")
 scriptPath=$(dirname "$0")
-scriptArgs=$*
 
 . "$scriptPath/shared.sh"
 
@@ -110,4 +109,4 @@ fi
 # required Java version is dependent on use of encryption
 javaSetup $minJdkVersion
 
-runWlst deploy.py
+runWlst deploy.py "$@"

installer/src/main/bin/discoverDomain.sh

@@ -92,7 +92,6 @@ WLSDEPLOY_PROGRAM_NAME="discoverDomain"; export WLSDEPLOY_PROGRAM_NAME
 
 scriptName=$(basename "$0")
 scriptPath=$(dirname "$0")
-scriptArgs=$*
 
 . "$scriptPath/shared.sh"
 
@@ -108,4 +107,4 @@ fi
 # required Java version is dependent on use of encryption
 javaSetup $minJdkVersion
 
-runWlst discover.py
+runWlst discover.py "$@"

installer/src/main/bin/encryptModel.sh

@@ -65,7 +65,6 @@ WLSDEPLOY_PROGRAM_NAME="encryptModel"; export WLSDEPLOY_PROGRAM_NAME
 
 scriptName=$(basename "$0")
 scriptPath=$(dirname "$0")
-scriptArgs=$*
 
 . "$scriptPath/shared.sh"
 
@@ -76,4 +75,4 @@ checkJythonArgs "$@"
 # Java 8 is required for encryption library
 javaSetup 8
 
-runJython encrypt.py
+runJython encrypt.py "$@"

installer/src/main/bin/extractDomainResource.sh

@@ -71,7 +71,6 @@ WLSDEPLOY_PROGRAM_NAME="extractDomainResource"; export WLSDEPLOY_PROGRAM_NAME
 
 scriptName=$(basename "$0")
 scriptPath=$(dirname "$0")
-scriptArgs=$*
 
 . "$scriptPath/shared.sh"
 
@@ -87,4 +86,4 @@ fi
 # required Java version is dependent on use of encryption
 javaSetup $minJdkVersion
 
-runJython extract_resource.py
+runJython extract_resource.py "$@"

installer/src/main/bin/injectVariables.sh

@@ -74,7 +74,6 @@ WLSDEPLOY_PROGRAM_NAME="injectVariables"; export WLSDEPLOY_PROGRAM_NAME
 
 scriptName=$(basename "$0")
 scriptPath=$(dirname "$0")
-scriptArgs=$*
 
 . "$scriptPath/shared.sh"
 
@@ -85,4 +84,4 @@ checkJythonArgs "$@"
 # Java 7 is required, no encryption is used
 javaSetup 7
 
-runJython variable_inject.py
+runJython variable_inject.py "$@"

installer/src/main/bin/modelHelp.sh

@@ -71,7 +71,6 @@ WLSDEPLOY_PROGRAM_NAME="modelHelp"; export WLSDEPLOY_PROGRAM_NAME
 
 scriptName=$(basename "$0")
 scriptPath=$(dirname "$0")
-scriptArgs=$*
 
 . "$scriptPath/shared.sh"
 
@@ -82,4 +81,4 @@ checkJythonArgs "$@"
 # Java 7 is required, no encryption is used
 javaSetup 7
 
-runJython model_help.py
+runJython model_help.py "$@"

installer/src/main/bin/prepareModel.sh

@@ -43,7 +43,6 @@ WLSDEPLOY_PROGRAM_NAME="prepareModel"; export WLSDEPLOY_PROGRAM_NAME
 
 scriptName=$(basename "$0")
 scriptPath=$(dirname "$0")
-scriptArgs=$*
 
 . "$scriptPath/shared.sh"
 
@@ -54,4 +53,4 @@ checkJythonArgs "$@"
 # Java 7 is required, no encryption is used
 javaSetup 7
 
-runJython prepare_model.py
+runJython prepare_model.py "$@"

installer/src/main/bin/shared.sh

@@ -126,7 +126,8 @@ checkJythonArgs() {
         # if -oracle_home argument was not found, but ORACLE_HOME was set in environment,
         # add the -oracle_home argument with the environment value.
         # put it at the beginning to protect trailing arguments.
-        scriptArgs="-oracle_home \"${ORACLE_HOME}\" ${scriptArgs}"
+	      OHARG="-oracle_home "
+	      OHARG_VALUE="${ORACLE_HOME}"
     fi
 
     #
@@ -236,9 +237,13 @@ runWlst() {
     echo "WLST_PROPERTIES = ${WLST_PROPERTIES}"
 
     PY_SCRIPTS_PATH="${WLSDEPLOY_HOME}/lib/python"
-    echo "${WLST} ${PY_SCRIPTS_PATH}/$wlstScript ${scriptArgs}"
-
-    "${WLST}" "${PY_SCRIPTS_PATH}/$wlstScript" ${scriptArgs}
+    if [ -z "${OHARG_VALUE}" ] ; then
+      echo "${WLST} ${PY_SCRIPTS_PATH}/$wlstScript ${@:2}"
+      "${WLST}" "${PY_SCRIPTS_PATH}/$wlstScript" "${@:2}"
+    else
+      echo "${WLST} ${PY_SCRIPTS_PATH}/$wlstScript $OHARG \"${OHARG_VALUE}\" ${@:2}"
+      "${WLST}" "${PY_SCRIPTS_PATH}/$wlstScript" $OHARG "${OHARG_VALUE}" "${@:2}"
+    fi
 
     RETURN_CODE=$?
     checkExitCode ${RETURN_CODE}
@@ -263,14 +268,13 @@ runJython() {
     variableSetup
 
     JAVA_PROPERTIES="-Djava.util.logging.config.class=${LOG_CONFIG_CLASS}"
-    JAVA_PROPERTIES="${JAVA_PROPERTIES} -Dpython.cachedir.skip=true"
-    JAVA_PROPERTIES="${JAVA_PROPERTIES} -Dpython.path=${ORACLE_SERVER_DIR}/common/wlst/modules/jython-modules.jar/Lib"
-    JAVA_PROPERTIES="${JAVA_PROPERTIES} -Dpython.console="
-    JAVA_PROPERTIES="${JAVA_PROPERTIES}  ${WLSDEPLOY_PROPERTIES}"
+    JAVA_PROPERTIES+=" -Dpython.cachedir.skip=true"
+    JAVA_PROPERTIES+=" -Dpython.console="
+    JAVA_PROPERTIES+=" ${WLSDEPLOY_PROPERTIES}"
     export JAVA_PROPERTIES
-
     CLASSPATH="${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar"
-    CLASSPATH="${CLASSPATH}:${ORACLE_SERVER_DIR}/server/lib/weblogic.jar"
+    CLASSPATH+=":"
+    CLASSPATH+="$ORACLE_SERVER_DIR/server/lib/weblogic.jar"
 
     # print the configuration, and run the script
 
@@ -280,16 +284,35 @@ runJython() {
 
     PY_SCRIPTS_PATH="${WLSDEPLOY_HOME}/lib/python"
 
-    echo \
-    ${JAVA_HOME}/bin/java -cp ${CLASSPATH} \
-        ${JAVA_PROPERTIES} \
-        org.python.util.jython \
-        "${PY_SCRIPTS_PATH}/$jythonScript" ${scriptArgs}
 
-    "${JAVA_HOME}/bin/java" -cp "${CLASSPATH}" \
-        ${JAVA_PROPERTIES} \
-        org.python.util.jython \
-        "${PY_SCRIPTS_PATH}/$jythonScript" ${scriptArgs}
+
+    if [ -z "${OHARG_VALUE}" ] ; then
+      echo \
+      ${JAVA_HOME}/bin/java -cp ${CLASSPATH} \
+          $JAVA_PROPERTIES \
+          -Dpython.path="$ORACLE_SERVER_DIR/common/wlst/modules/jython-modules.jar/Lib" \
+          org.python.util.jython \
+          "${PY_SCRIPTS_PATH}/$jythonScript" ${@:2}
+
+      "${JAVA_HOME}/bin/java" -cp "$CLASSPATH" \
+          $JAVA_PROPERTIES  \
+          -Dpython.path="$ORACLE_SERVER_DIR/common/wlst/modules/jython-modules.jar/Lib" \
+          org.python.util.jython \
+          "${PY_SCRIPTS_PATH}/$jythonScript" "${@:2}"
+    else
+      echo \
+      ${JAVA_HOME}/bin/java -cp ${CLASSPATH} \
+          $JAVA_PROPERTIES \
+          -Dpython.path="$ORACLE_SERVER_DIR/common/wlst/modules/jython-modules.jar/Lib" \
+          org.python.util.jython \
+          "${PY_SCRIPTS_PATH}/$jythonScript" $OHARG \"${OHARG_VALUE}\" ${@:2}
+          
+      "${JAVA_HOME}/bin/java" -cp "$CLASSPATH" \
+          $JAVA_PROPERTIES  \
+          -Dpython.path="$ORACLE_SERVER_DIR/common/wlst/modules/jython-modules.jar/Lib" \
+          org.python.util.jython \
+          "${PY_SCRIPTS_PATH}/$jythonScript" $OHARG "${OHARG_VALUE}" "${@:2}"
+    fi
 
     RETURN_CODE=$?
     checkExitCode ${RETURN_CODE}