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

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

NEW: added 18296-19100
File size: 1.9 KB
RevLine 
[19102]1Index: ../trunk-jpl/packagers/macosx/install.sh
2===================================================================
3--- ../trunk-jpl/packagers/macosx/install.sh (revision 18417)
4+++ ../trunk-jpl/packagers/macosx/install.sh (revision 18418)
5@@ -46,16 +46,8 @@
6
7 cd $PACKAGENAME
8
9- #tricky part here. We do not want to reinstall this package if it's already installed
10- #and the svn file which does the install has not be modified! To keep track of
11- #this, we check the current svn version against the "last changed" revision number. If they
12- #are the same, we reinstall the package.
13- current_version=`svnversion`
14- last_changed_version=`svn info $PACKAGEINST | grep "Last Changed Rev" | awk '{printf("%s\n",$4);}'`
15-
16- if [[ $current_version == $last_changed_version ]]; then
17+ if [[ $PACKAGEINST -nt install ]]; then
18 #go ahead and reinstall.
19- echo "For $PACKAGENAME: svn current_version is $current_version and last changed version is $last_changed_version"
20 echo "Triggering new install of $PACKAGENAME"
21 install_test=1
22 else
23@@ -63,16 +55,13 @@
24 if [ -d install ]; then
25 #could be empty, signaling a failed previous install:
26 if [ "$(ls -A install)" ];then
27- echo "For $PACKAGENAME: svn current_version is $current_version and last changed version is $last_changed_version"
28 echo "and install directory exists, so skipping install of $PACKAGENAME"
29 install_test=0;
30 else
31- echo "For $PACKAGENAME: svn current_version is $current_version and last changed version is $last_changed_version"
32 echo "and install directory exists, however, it is empty, so triggering install of $PACKAGENAME"
33 install_test=1;
34 fi
35 else
36- echo "For $PACKAGENAME: svn current_version is $current_version and last changed version is $last_changed_version"
37 echo "However, install directory does not exist, so triggering install of $PACKAGENAME"
38 install_test=1;
39 fi
Note: See TracBrowser for help on using the repository browser.