@@ -179,6 +179,8 @@ variableSetup() {
179
179
runWlst () {
180
180
# run a WLST script.
181
181
wlstScript=$1
182
+ # save first argument in wlstScript, and discard argument from $@
183
+ shift
182
184
183
185
variableSetup
184
186
@@ -238,11 +240,11 @@ runWlst() {
238
240
239
241
PY_SCRIPTS_PATH=" ${WLSDEPLOY_HOME} /lib/python"
240
242
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 " " $@ "
243
245
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} " " $@ "
246
248
fi
247
249
248
250
RETURN_CODE=$?
@@ -253,6 +255,8 @@ runWlst() {
253
255
runJython () {
254
256
# run a jython script, without WLST.
255
257
jythonScript=$1
258
+ # save first argument in jythonScript, and discard argument from $@
259
+ shift
256
260
257
261
# set up Oracle directory, logger, classpath
258
262
@@ -282,34 +286,32 @@ runJython() {
282
286
283
287
PY_SCRIPTS_PATH=" ${WLSDEPLOY_HOME} /lib/python"
284
288
285
-
286
-
287
289
if [ -z " ${OHARG_VALUE} " ] ; then
288
290
echo \
289
- ${JAVA_HOME} /bin/java -cp ${CLASSPATH} \
291
+ " ${JAVA_HOME} /bin/java -cp ${CLASSPATH} \
290
292
$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 \
292
294
org.python.util.jython \
293
- " ${PY_SCRIPTS_PATH} /$jythonScript " ${ @: 2}
295
+ ${PY_SCRIPTS_PATH} /$jythonScript " " $@ "
294
296
295
297
" ${JAVA_HOME} /bin/java" -cp " $CLASSPATH " \
296
298
$JAVA_PROPERTIES \
297
299
-Dpython.path=" $ORACLE_SERVER_DIR /common/wlst/modules/jython-modules.jar/Lib" \
298
300
org.python.util.jython \
299
- " ${PY_SCRIPTS_PATH} /$jythonScript " " ${ @: 2} "
301
+ " ${PY_SCRIPTS_PATH} /$jythonScript " " $@ "
300
302
else
301
303
echo \
302
- ${JAVA_HOME} /bin/java -cp ${CLASSPATH} \
304
+ " ${JAVA_HOME} /bin/java -cp ${CLASSPATH} \
303
305
$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 \
305
307
org.python.util.jython \
306
- " ${PY_SCRIPTS_PATH} /$jythonScript " $OHARG \" ${OHARG_VALUE} \" ${ @: 2}
308
+ ${PY_SCRIPTS_PATH} /$jythonScript $OHARG ${OHARG_VALUE} " " $@ "
307
309
308
310
" ${JAVA_HOME} /bin/java" -cp " $CLASSPATH " \
309
311
$JAVA_PROPERTIES \
310
312
-Dpython.path=" $ORACLE_SERVER_DIR /common/wlst/modules/jython-modules.jar/Lib" \
311
313
org.python.util.jython \
312
- " ${PY_SCRIPTS_PATH} /$jythonScript " $OHARG " ${OHARG_VALUE} " " ${ @: 2} "
314
+ " ${PY_SCRIPTS_PATH} /$jythonScript " $OHARG " ${OHARG_VALUE} " " $@ "
313
315
fi
314
316
315
317
RETURN_CODE=$?
0 commit comments