Changeset 19600

Timestamp:

09/29/15 02:00:45 (10 years ago)

Author:

glperez

Message:

CHG: Updated OS variable for Jenkins Windows build.

File:

• issm/trunk-jpl/jenkins/jenkins.sh (modified) (3 diffs)

issm/trunk-jpl/jenkins/jenkins.sh

@@ -20 +20 @@
 #Get Operating system (OS) name{{{
 OS=$(uname -s)
-if [[ $OS == "CYGWIN_NT-6.1-WOW64" ]]; then 
-        OS="win7";
+if [[ $OS == "CYGWIN_NT-6.2" ]]; then 
+        OS="win";
 fi
 #}}}
@@ -135 +135 @@
 fi
 
-if [ "$OS" == "win7" ]
+if [ "$OS" == "win" ]
 then
         source $ISSM_DIR/externalpackages/windows/windows_environment.sh
@@ -215 +215 @@
 
 #wait until matlab closes
-if [ "$OS" = "win7" ]; then
+if [ "$OS" = "win" ]; then
         echo "Waiting for matlab on windows"
         pid=$(ps aux -W | grep MATLAB | awk '{printf("%s\n","MATLAB");}')