Skip to content

Commit 897867c

Browse files
authored
Remove usage of array in shared.sh (#993)
* remove bash-ism from shared script to adhere to Bourne script standard * make quoting on echo statements consistent per review comments
1 parent 6d58db0 commit 897867c

File tree

1 file changed

+16
-14
lines changed

1 file changed

+16
-14
lines changed

installer/src/main/bin/shared.sh

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,8 @@ variableSetup() {
179179
runWlst() {
180180
# run a WLST script.
181181
wlstScript=$1
182+
# save first argument in wlstScript, and discard argument from $@
183+
shift
182184

183185
variableSetup
184186

@@ -238,11 +240,11 @@ runWlst() {
238240

239241
PY_SCRIPTS_PATH="${WLSDEPLOY_HOME}/lib/python"
240242
if [ -z "${OHARG_VALUE}" ] ; then
241-
echo "${WLST} ${PY_SCRIPTS_PATH}/$wlstScript ${@:2}"
242-
"${WLST}" "${PY_SCRIPTS_PATH}/$wlstScript" "${@:2}"
243+
echo "${WLST} ${PY_SCRIPTS_PATH}/$wlstScript" "$@"
244+
"${WLST}" "${PY_SCRIPTS_PATH}/$wlstScript" "$@"
243245
else
244-
echo "${WLST} ${PY_SCRIPTS_PATH}/$wlstScript $OHARG \"${OHARG_VALUE}\" ${@:2}"
245-
"${WLST}" "${PY_SCRIPTS_PATH}/$wlstScript" $OHARG "${OHARG_VALUE}" "${@:2}"
246+
echo "${WLST} ${PY_SCRIPTS_PATH}/$wlstScript $OHARG ${OHARG_VALUE}" "$@"
247+
"${WLST}" "${PY_SCRIPTS_PATH}/$wlstScript" $OHARG "${OHARG_VALUE}" "$@"
246248
fi
247249

248250
RETURN_CODE=$?
@@ -253,6 +255,8 @@ runWlst() {
253255
runJython() {
254256
# run a jython script, without WLST.
255257
jythonScript=$1
258+
# save first argument in jythonScript, and discard argument from $@
259+
shift
256260

257261
# set up Oracle directory, logger, classpath
258262

@@ -282,34 +286,32 @@ runJython() {
282286

283287
PY_SCRIPTS_PATH="${WLSDEPLOY_HOME}/lib/python"
284288

285-
286-
287289
if [ -z "${OHARG_VALUE}" ] ; then
288290
echo \
289-
${JAVA_HOME}/bin/java -cp ${CLASSPATH} \
291+
"${JAVA_HOME}/bin/java -cp ${CLASSPATH} \
290292
$JAVA_PROPERTIES \
291-
-Dpython.path="$ORACLE_SERVER_DIR/common/wlst/modules/jython-modules.jar/Lib" \
293+
-Dpython.path=$ORACLE_SERVER_DIR/common/wlst/modules/jython-modules.jar/Lib \
292294
org.python.util.jython \
293-
"${PY_SCRIPTS_PATH}/$jythonScript" ${@:2}
295+
${PY_SCRIPTS_PATH}/$jythonScript" "$@"
294296

295297
"${JAVA_HOME}/bin/java" -cp "$CLASSPATH" \
296298
$JAVA_PROPERTIES \
297299
-Dpython.path="$ORACLE_SERVER_DIR/common/wlst/modules/jython-modules.jar/Lib" \
298300
org.python.util.jython \
299-
"${PY_SCRIPTS_PATH}/$jythonScript" "${@:2}"
301+
"${PY_SCRIPTS_PATH}/$jythonScript" "$@"
300302
else
301303
echo \
302-
${JAVA_HOME}/bin/java -cp ${CLASSPATH} \
304+
"${JAVA_HOME}/bin/java -cp ${CLASSPATH} \
303305
$JAVA_PROPERTIES \
304-
-Dpython.path="$ORACLE_SERVER_DIR/common/wlst/modules/jython-modules.jar/Lib" \
306+
-Dpython.path=$ORACLE_SERVER_DIR/common/wlst/modules/jython-modules.jar/Lib \
305307
org.python.util.jython \
306-
"${PY_SCRIPTS_PATH}/$jythonScript" $OHARG \"${OHARG_VALUE}\" ${@:2}
308+
${PY_SCRIPTS_PATH}/$jythonScript $OHARG ${OHARG_VALUE}" "$@"
307309

308310
"${JAVA_HOME}/bin/java" -cp "$CLASSPATH" \
309311
$JAVA_PROPERTIES \
310312
-Dpython.path="$ORACLE_SERVER_DIR/common/wlst/modules/jython-modules.jar/Lib" \
311313
org.python.util.jython \
312-
"${PY_SCRIPTS_PATH}/$jythonScript" $OHARG "${OHARG_VALUE}" "${@:2}"
314+
"${PY_SCRIPTS_PATH}/$jythonScript" $OHARG "${OHARG_VALUE}" "$@"
313315
fi
314316

315317
RETURN_CODE=$?

0 commit comments

Comments
 (0)