fix status returned by build scripts

I-TECH-UW · Sep 21, 2023 · 1908298 · 1908298
1 parent cd2a8ae
commit 1908298
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/build.sh b/build.sh
@@ -91,35 +91,39 @@ echo "creating docker images"
 #create data import docker image
 #bash ${INSTALL_DIR}/buildProject.sh -dl ${CONSOLIDATED_SERVER_DIR}
 bash ${INSTALL_DIR}/buildProject.sh -dl ${PROJECT_DIR}/fhir -t hapi-fhir-jpaserver
-if [ $? != 0 ]
+SUCCESS=$?
+if [ $SUCCESS != 0 ]
 then
     echo
     echo build failed hapi-fhir-jpaserver
-    exit $?
+    exit $SUCCESS
 fi
 #create the frontend docker image 
 bash ${INSTALL_DIR}/buildProject.sh -dl ${PROJECT_DIR}/frontend -t openelisglobal-frontend
-if [ $? != 0 ]
+SUCCESS=$?
+if [ $SUCCESS != 0 ]
 then
     echo
     echo build failed openelisglobal-frontend
-    exit $?
+    exit $SUCCESS
 fi
 #create the frontend docker image 
 bash ${INSTALL_DIR}/buildProject.sh -dl ${PROJECT_DIR}/nginx-proxy -t nginx-proxy
-if [ $? != 0 ]
+SUCCESS=$?
+if [ $SUCCESS != 0 ]
 then
     echo
     echo build failed nginx-proxy
-    exit $?
+    exit $SUCCESS
 fi
 #create the docker image 
 bash ${INSTALL_DIR}/buildProject.sh -dl ${PROJECT_DIR} -t openelisglobal
-if [ $? != 0 ]
+SUCCESS=$?
+if [ $SUCCESS != 0 ]
 then
     echo
     echo build failed openelisglobal
-    exit $?
+    exit $SUCCESS
 fi
 
 createLinuxInstaller() {

diff --git a/install/buildProject.sh b/install/buildProject.sh
@@ -49,9 +49,10 @@ else
 	mvn clean install -DskipTests
 fi
 
-if [ $? != 0 ]
+SUCCESS=$? 	
+if [ $SUCCESS != 0 ]
 then
     echo
     echo build failed
-    exit $?
+    exit $SUCCESS
 fi