Changeset 1080 for trunk

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

Location:

trunk

Files:

• bin/asap (modified) (1 diff)
• python/__init__.py (modified) (3 diffs)

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

trunk/python/__init__.py

@@ -3 +3 @@
 
 """
-import os,sys
+import os,sys,shutil, platform
+
+# Set up AIPSPATH and first time use of asap i.e. ~/.asap/*
+plf = None
+if sys.platform == "linux2":
+    if platform.architecture()[0] == '64bit':
+        plf = 'linux_64b'
+    else:
+        plf = 'linux_gnu'
+elif sys.platform == 'darwin':
+    plf = 'darwin'
+else:
+    # Shouldn't happen - default to linux
+    plf = 'linux'
+asapdata = __path__[-1]
+os.environ["AIPSPATH"] = "%s %s somwhere" % ( asapdata, plf)
+userdir = os.environ["HOME"]+"/.asap"
+if not os.path.exists(userdir):
+    print 'First time ASAP use. Setting up ~/.asap'
+    os.mkdir(userdir)
+    shutil.copyfile(asapdata+"/data/ipythonrc-asap", userdir+"/ipythonrc-asap")
+    f = file(userdir+"/asapuserfuncs.py", "w")
+    f.close()
+    f = file(userdir+"/ipythonrc", "w")
+    f.close()
+del asapdata, userdir, shutil, platform
 
 def _validate_bool(b):
@@ -165 +190 @@
         val = val.strip()
         try: cval = converter(val)   # try to convert to proper type or raise
-        except Exception, msg:
+        except ValueError, msg:
             print ('Bad val "%s" on line #%d\n\t"%s"\n\tin file "%s"\n\t%s' % (val, cnt, line, fname, msg))
             continue
@@ -295 +320 @@
 
 from asapmath import *
-from scantable import *
+from scantable import scantable
 from asaplinefind import *
 #from asapfit import *