Changeset 20543

Timestamp:

04/25/16 09:52:26 (9 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixing externalpackages

File:

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

issm/trunk-jpl/jenkins/jenkins.sh

@@ -63 +63 @@
         if [ ! -z "$(cat $ISSM_DIR/TEMP | grep externalpackages)" ] ; then
                 echo "  -- checking for changed externalpackages... yes";
-                ISSM_EXTERNALPACKAGES="install"
+                ISSM_EXTERNALPACKAGES="yes"
         else
                 echo "  -- checking for changed externalpackages... no";
-                ISSM_EXTERNALPACKAGES="none"
+                ISSM_EXTERNALPACKAGES="no"
         fi
 
@@ -92 +92 @@
         echo "  -- checking for reconfiguration... yes";
         echo "  -- checking for recompilation... yes";
-        ISSM_EXTERNALPACKAGES="install"
+        ISSM_EXTERNALPACKAGES="yes"
         ISSM_RECONFIGURE="yes"
         ISSM_COMPILATION="yes"
@@ -100 +100 @@
 echo $SVN_REVISION_1 > $ISSM_DIR/svn_revision_old
 #}}}
-#install/none external packages    (ISSM_EXTERNALPACKAGES){{{
+#Install external packages    (ISSM_EXTERNALPACKAGES){{{
 
 #Jenkins xml files for individual packages
@@ -119 +119 @@
 
         #install if requested or if previous install has not been successful
-        if [ "$ISSM_EXTERNALPACKAGES" == "install" ] || [ ! -f SUCCESS ]; then
+        if [ "$ISSM_EXTERNALPACKAGES" == "yes" ] || [ ! -f SUCCESS ]; then
                 echo "======================================================";
                 echo "       Installing $PACKAGENAME                        ";