Changeset 1080 for trunk/bin

Timestamp:

07/25/06 09:34:03 (18 years ago)

Author:

mar637

Message:

move all the environment set-up into python asap module. only detect ipython and run with profile in shell script

File:

• trunk/bin/asap (modified) (1 diff)

trunk/bin/asap

@@ -34 +34 @@
 echo "Loading ASAP..."
 
-prefix='/usr/local'
+ip="`which ipython`"
+p="`which python`"
 
-# check if user set
-if [ "x${ASAPDATA}" == "x" ]; then
-    ASAPDATA="${prefix}/share/asap"
-    export ASAPDATA
-fi
-
-if [ ! -d "${ASAPDATA}" ]; then
-    echo "Couldn't locate the asap data directory"
-    echo "Please set ASAPDATA"
-    #ASAPDATA="/nfs/aips++"
-    #export ASAPDATA
-    #exit 1
-fi
-
-# Keep casa measures happy
-if test -d "${ASAPDATA}/data" ; then
-    platform='linux_gnu'
-    if [ `uname -s` == 'Darwin' ]; then
-        platform='darwin'
-    fi
-    AIPSPATH="${ASAPDATA} ${platform} somewhere localhost"
-    export AIPSPATH
-else
-    echo "Couldn't find the ASAP data directory"
-    exit 1
-fi
-
-# started for the first time
-ASAPUSERDIR="${HOME}/.asap"; export ASAPUSERDIR
-if [ ! -d ${ASAPUSERDIR} ]; then
-    echo 'First time ASAP use. Setting up ~/.asap'
-    mkdir "${ASAPUSERDIR}"
-    cp "${ASAPDATA}/ipythonrc-asap" "${ASAPUSERDIR}/"
-    echo "#Dummy placeholder. All info is in ipythonrc-asap" > "${ASAPUSERDIR}/ipythonrc"
-    touch "${ASAPUSERDIR}/asapuserfuncs.py"
-fi
-
-ip="`which ipython`"
-
+# no ipython installation - run without all the goodies
 if [ ! -x "$ip" ]; then
     echo "Can't find, or no execute permissions for 'ipython'"
     echo "Running asap through 'python':"
-    p="`which python`"
     $p -c 'from asap import *'
 else
-    $ip -ipythondir "${ASAPUSERDIR}" -p 'asap' $*
+    # if run for the first time set-up ipythonrc profile and ~/.asap
+    if [ ! -d "${HOME}/.asap" ]; then
+        $p -c "import asap"
+    fi
+    # now execute ipython using the profile
+    $ip -ipythondir "${HOME}/.asap" -p 'asap' $*
 fi