Index: ../trunk-jpl/packagers/macosx/install.sh =================================================================== --- ../trunk-jpl/packagers/macosx/install.sh (revision 18417) +++ ../trunk-jpl/packagers/macosx/install.sh (revision 18418) @@ -46,16 +46,8 @@ 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 else @@ -63,16 +55,13 @@ if [ -d install ]; then #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; fi