[issm-svn] r23313 - issm/trunk/packagers/win10

[jdquinn at issm.ess.uci.edu]

Author: jdquinn
Date: 2018-09-18 13:27:05 -0700 (Tue, 18 Sep 2018)
New Revision: 23313

Modified:
   issm/trunk/packagers/win10/package64.sh
Log:
CHG: Packaging Win10 binaries instead as a tarball

Modified: issm/trunk/packagers/win10/package64.sh
===================================================================
--- issm/trunk/packagers/win10/package64.sh	2018-09-18 20:13:49 UTC (rev 23312)
+++ issm/trunk/packagers/win10/package64.sh	2018-09-18 20:27:05 UTC (rev 23313)
@@ -22,23 +22,14 @@
 
 $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
 	echo "test101 FAILED"