source: issm/oecreview/Archive/18296-19100/ISSM-18417-18418.diff@ 19102

Last change on this file since 19102 was 19102, checked in by Mathieu Morlighem, 10 years ago

NEW: added 18296-19100

File size: 1.9 KB
  • ../trunk-jpl/packagers/macosx/install.sh

     
    4646
    4747        cd $PACKAGENAME
    4848
    49         #tricky part here. We do not want to reinstall this package if it's already installed
    50         #and the svn file which does the install has not be modified! To keep track of
    51         #this, we check the current svn version against the "last changed" revision number.  If they
    52         #are the same, we reinstall the package.
    53         current_version=`svnversion`
    54         last_changed_version=`svn info $PACKAGEINST | grep "Last Changed Rev" | awk '{printf("%s\n",$4);}'`
    55 
    56         if [[ $current_version == $last_changed_version ]]; then
     49        if [[ $PACKAGEINST -nt  install ]]; then
    5750                #go ahead and reinstall.
    58                 echo "For $PACKAGENAME: svn current_version  is $current_version and last changed version is $last_changed_version"
    5951                echo "Triggering new install of $PACKAGENAME"
    6052                install_test=1
    6153        else
     
    6355                if [ -d install ]; then
    6456                        #could be empty, signaling a failed previous install:
    6557                        if [ "$(ls -A install)" ];then
    66                                 echo "For $PACKAGENAME: svn current_version  is $current_version and last changed version is $last_changed_version"
    6758                                echo "and install directory exists, so skipping install of $PACKAGENAME"
    6859                                install_test=0;
    6960                        else
    70                                 echo "For $PACKAGENAME: svn current_version  is $current_version and last changed version is $last_changed_version"
    7161                                echo "and install directory exists, however, it is empty, so triggering install of $PACKAGENAME"
    7262                                install_test=1;
    7363                        fi
    7464                else
    75                         echo "For $PACKAGENAME: svn current_version  is $current_version and last changed version is $last_changed_version"
    7665                        echo "However, install directory does not exist, so triggering install of $PACKAGENAME"
    7766                        install_test=1;
    7867                fi
Note: See TracBrowser for help on using the repository browser.