Changeset 2817 for trunk

Timestamp:

07/02/13 10:33:59 (11 years ago)

Author:

Malte Marquarding

Message:

update OSX install script to use latest version; tidy up tmp dir handling

File:

• trunk/install_osx.sh (modified) (3 diffs)

trunk/install_osx.sh

@@ -1 +1 @@
 #!/bin/sh
 
+MPLTMP=/tmp/mpltmp
 FTPURL="ftp://ftp.atnf.csiro.au/pub/software/asap"
+
+trap 'rm -rf /tmp/mpltmp' EXIT
 
 #test -n $1 && export http_proxy=$1
@@ -13 +16 @@
 echo $OSXVERS
 if [ -z ${OSXVERS} ]; then echo "Only OS X >= 10.7 supported"; exit 1; fi
-ASAPEGG="${FTPURL}/${ASAPVERS}/asap-4.1.0-py2.7-macosx-${OSXVERS}-intel.egg"
+if [ "$OSXVERS" == '10.8' ]
+then
+    ASAPEGG="${FTPURL}/${ASAPVERS}/asap-4.1.2-py2.7-macosx-${OSXVERS}-intel.egg"
+else
+    ASAPEGG="${FTPURL}/${ASAPVERS}/asap-4.1.0-py2.7-macosx-${OSXVERS}-intel.egg"
+fi
 MPLEGG="${FTPURL}/matplotlib/matplotlib-1.1.1-py2.7-macosx-${OSXVERS}-intel.egg"
 MPL=$(/usr/bin/python -c 'import matplotlib' >/dev/null 2>&1)
@@ -30 +38 @@
 
 # update measures data
-MPLTMP=/tmp/mpltmp
 mkdir ${MPLTMP}
-MPLCONFIGDIR="${MPLTMP}" /usr/local/bin/asap_update_data
-rm -rf ${MPLTMP}
+MPLCONFIGDIR="${MPLTMP}" 
+/usr/local/bin/asap_update_data