Changeset 18418

Timestamp:

08/16/14 13:27:07 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: testing

File:

• issm/trunk-jpl/packagers/macosx/install.sh (modified) (2 diffs)

issm/trunk-jpl/packagers/macosx/install.sh

@@ -47 +47 @@
         cd $PACKAGENAME
 
-        #tricky part here. We do not want to reinstall this package if it's already installed
-        #and the svn file which does the install has not be modified! To keep track of 
-        #this, we check the current svn version against the "last changed" revision number.  If they 
-        #are the same, we reinstall the package. 
-        current_version=`svnversion`
-        last_changed_version=`svn info $PACKAGEINST | grep "Last Changed Rev" | awk '{printf("%s\n",$4);}'`
-
-        if [[ $current_version == $last_changed_version ]]; then 
+        if [[ $PACKAGEINST -nt  install ]]; then 
                 #go ahead and reinstall. 
-                echo "For $PACKAGENAME: svn current_version  is $current_version and last changed version is $last_changed_version"
                 echo "Triggering new install of $PACKAGENAME"
                 install_test=1
@@ -64 +56 @@
                         #could be empty, signaling a failed previous install: 
                         if [ "$(ls -A install)" ];then
-                                echo "For $PACKAGENAME: svn current_version  is $current_version and last changed version is $last_changed_version"
                                 echo "and install directory exists, so skipping install of $PACKAGENAME"
                                 install_test=0;
                         else
-                                echo "For $PACKAGENAME: svn current_version  is $current_version and last changed version is $last_changed_version"
                                 echo "and install directory exists, however, it is empty, so triggering install of $PACKAGENAME"
                                 install_test=1;
                         fi
                 else
-                        echo "For $PACKAGENAME: svn current_version  is $current_version and last changed version is $last_changed_version"
                         echo "However, install directory does not exist, so triggering install of $PACKAGENAME"
                         install_test=1;