Changeset 340 for SH_SHM/trunk

Timestamp:

03/03/2011 05:37:32 PM (13 years ago)

Author:

marcus

Message:

r179 | walther | 2011-03-03 17:35:27 +0100 (Do, 03 Mär 2011) | 1 line

...

Location:

SH_SHM/trunk/setup

Files:

• SHM-install.csh (modified) (6 diffs)
• setup.py (modified) (4 diffs)

SH_SHM/trunk/setup/SHM-install.csh

@@ -82 +82 @@
 while  ("$cmd" != "i")
 
+        echo "======================================================================"
         echo ""
         echo "(u)  user root path:           $userroot"
@@ -89 +90 @@
         echo "(q)  Quit Installation"
         echo ""
-        echo "if all settings are ok, enter 'i'"
+        echo "If all settings are ok, enter 'i'"
         echo ""
-        echo -n "cmd: "
+        echo -n "Your command: "
         set cmd="$<"
 
@@ -232 +233 @@
 cd $SH_LIB
 if  (-e libahio.a)  mv libahio.a libahio.ax
-\rm *.a
+\rm *.a > /dev/null
 if  (-e libahio.ax)  mv libahio.ax libahio.a
 cd $SH_ROOT
@@ -278 +279 @@
         touch $resrc
 endif
-set res=`grep "SHM*locsat_prefix_text" $resrc`
+set res=`grep "SHM.locsat_prefix_text" $resrc`
 if  ("$res" == "")  then
         echo "SHM*locsat_prefix_text.value:       tab"  >>$resrc
@@ -295 +296 @@
 xrdb $resrc
 
-echo ""
+echo "========================================================================"
 echo ""
 echo "Please update your environment before using SH or SHM!"
@@ -305 +306 @@
 echo "source $dstpath/sh/setup/shsetup.sh"
 echo ""
+echo "========================================================================"

SH_SHM/trunk/setup/setup.py

@@ -1 @@
-import os.path
 #! /usr/bin/env python
 
@@ -41 +40 @@
 def download(target, pkg):
     print "Downloading %s..." % pkg
-    os.system("wget -P %s %s" % (target, downloads[pkg]))
+    os.system("wget -q -P %s %s" % (target, downloads[pkg]))
 
 def setup(**kwargs):
@@ -99 +98 @@
     flist = ["STATINF.DAT", "sensitivities.txt", "filter_lookup.txt"]
 
-    print "A backup of your shm-config.txt has been saved under"
+    print "\nA backup of your shm-config.txt has been saved under"
     print " %s/sh/inputs/shm-config.txt.yours" % target
 
-    print "Seismic Handler comes with updated station configuration files."
+    print "\nSeismic Handler comes with updated station configuration files."
     a = raw_input("Do you want to use them (backup will be saved) [Yn]? ")
 
     if a == "n":
-        print "Please check the following files manually (sh/inputs):"
+        print "\nPlease check the following files manually (sh/inputs):"
         for f in flist:
             print f, "vs.", f+".dist"
@@ -112 +111 @@
 
     for f in flist:
-        tname = os.pathjoin(target, f)
+        tname = os.path.join(target, "sh/inputs", f)
         if os.path.exists(tname):
             print "Backing up %s... (to %s)" % (f, f+".yours")