Changeset 23313

Timestamp:

09/18/18 13:27:05 (7 years ago)

Author:

jdquinn

Message:

CHG: Packaging Win10 binaries instead as a tarball

File:

• issm/trunk/packagers/win10/package64.sh (modified) (1 diff)

issm/trunk/packagers/win10/package64.sh

@@ -23 +23 @@
 $MATLAB_PATH/bin/matlab -nodisplay -nosplash -r "try, addpath $ISSM_DIR_WIN/bin $ISSM_DIR_WIN/lib; runme('id',101); exit; catch me,fprintf('%s',getReport(me)); exit; end" -logfile matlab.log
 
-#wait until matlab closes
-if [ "$OS" = "win" ]; then
-        sleep 5;
-        echo "Waiting for Matlab to run test101"
+# Wait until MATLAB closes
+sleep 5
+pid=$(ps aux -W | grep MATLAB | awk '{printf("%s\n","MATLAB");}')
+while [ -n "$pid" ]
+do
         pid=$(ps aux -W | grep MATLAB | awk '{printf("%s\n","MATLAB");}')
-        echo '-----------------------------'
-        echo "pid: $pid"
-        echo '-----------------------------'
-        while [ -n "$pid" ]
-        do
-                pid=$(ps aux -W | grep MATLAB | awk '{printf("%s\n","MATLAB");}')
-                sleep 1;
-        done
-        echo "DONE!"
-else
-        wait
-fi
+        sleep 1
+done
 
 if [[ $(cat matlab.log | grep -c SUCCESS) -lt 10 ]]; then