Skip to content

Commit 5dd1050

Browse files
authored
fix script error compare condition (#2978)
1 parent 4b4ca04 commit 5dd1050

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

operator/src/main/resources/scripts/modelInImage.sh

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1253,7 +1253,7 @@ function encrypt_decrypt_domain_secret() {
12531253
function prepareMIIServer() {
12541254

12551255
trace "Model-in-Image: Creating domain home."
1256-
1256+
local ret=0
12571257
# primordial domain contain the basic structures, security and other fmwconfig templated info
12581258
# domainzip only contains the domain configuration (config.xml jdbc/ jms/)
12591259
# Both are needed for the complete domain reconstruction
@@ -1304,7 +1304,8 @@ function prepareMIIServer() {
13041304
# expand the archive domain libraries to the domain lib, 11 is caution when zip entry doesn't exists
13051305
cd ${DOMAIN_HOME}/lib || exitOrLoop
13061306
unzip -jo ${IMG_ARCHIVES_ROOTDIR}/${file} wlsdeploy/domainLibraries/*
1307-
if [ $? -ne 0 && $? -ne 11 ] ; then
1307+
ret=$?
1308+
if [ $ret -ne 0 ] && [ $ret -ne 11 ] ; then
13081309
trace SEVERE "Domain Source Type is FromModel, error in extracting domainLibraries " \
13091310
"${IMG_ARCHIVES_ROOTDIR}/${file}"
13101311
exitOrLoop
@@ -1314,7 +1315,8 @@ function prepareMIIServer() {
13141315
# zip entry doesn't exists
13151316
cd ${DOMAIN_HOME}/bin || exitOrLoop
13161317
unzip -jo ${IMG_ARCHIVES_ROOTDIR}/${file} wlsdeploy/domainBin/*
1317-
if [ $? -ne 0 && $? -ne 11 ] ; then
1318+
ret=$?
1319+
if [ $ret -ne 0 ] && [ $ret -ne 11 ] ; then
13181320
trace SEVERE "Domain Source Type is FromModel, error in extracting domainBin " \
13191321
"${IMG_ARCHIVES_ROOTDIR}/${file}"
13201322
exitOrLoop

0 commit comments

Comments
 (0)