Changeset 343 for SH_SHM/trunk

Timestamp:

03/10/2011 01:47:22 PM (13 years ago)

Author:

marcus

Message:

r182 | walther | 2011-03-10 13:46:51 +0100 (Do, 10 Mär 2011) | 1 line

minor changes in setup routine

Location:

SH_SHM/trunk/setup

Files:

• SHM-install.csh (modified) (6 diffs)
• makerelease.sh (modified) (1 diff)
• setup.py (modified) (4 diffs)

SH_SHM/trunk/setup/SHM-install.csh

@@ -25 +25 @@
 if  (! -w $dstpath)  then
         echo "$0 : cannot write to installation path $dstpath.  Abort."
-        exit
+        exit 1
 endif
 
@@ -73 +73 @@
         if  (! -e "$res")  then
                 echo "Program $p not found in search path.  Please add."
-                exit
+                exit 2
         endif
 end
@@ -95 +95 @@
         set cmd="$<"
 
-        if  ("$cmd" == "q")  exit
+        if  ("$cmd" == "q")  exit 99
         if  ("$cmd" == "r")  then
                 if  ("$displ_res" == "xga")  then
@@ -156 +156 @@
 else
         echo "$0 : sorry, this operating system is not supported"
-        exit
+        exit 3
 endif
 set locsatpath=$dstpath/sh/util/locsat
@@ -167 +167 @@
         if  ($plth > 25)  then
                 echo "$0 : cannot find short locsat path.  Abort."
-                exit
+                exit 4
         endif
 endif
@@ -209 +209 @@
 if  (! -e $origsetup)  then
         echo "Installation program error.  Sorry."
-        exit
+        exit  5
 endif
 set thissetup=$dstpath/sh/inputs/shm-config.txt
-if  (-e $thissetup)  \mv $thissetup $dstpath/sh/inputs/shm-config.txt.yours
+if  (-e $thissetup)  then
+    \mv $thissetup $dstpath/sh/inputs/shm-config.txt.yours
+    echo "A backup of your shm-config.txt has been saved under:"
+    echo $dstpath/sh/inputs/shm-config.txt.yours
+endif
 sed "s@##EDITOR##@$editor@" $origsetup > $thissetup
 

SH_SHM/trunk/setup/makerelease.sh

@@ -56 +56 @@
     cat decompress.sh > /tmp/SHM-install.sh
     base64 $TMPDIR/SHM.tar.gz >> /tmp/SHM-install.sh
+    chmod 755 /tmp/SHM-install.sh
 }
 

SH_SHM/trunk/setup/setup.py

@@ -33 +33 @@
 
 def banner():
-    print "="*78
+    print "="*70
     print "  Setup program v0.1 for Seismic Handler (SH/SHM)"
-    print "="*78
+    print "="*70
     print "\n This piece of software will try to setup the included source code.\n"
 
-def download(target, pkg):
+def download(target, pkg, dbg):
     print "Downloading %s..." % pkg
-    os.system("wget -q -P %s %s" % (target, downloads[pkg]))
+
+    verbose = dbg and "" or "-q "
+
+    if os.system("wget %s-P %s %s" % (verbose, target, downloads[pkg])):
+        abort("Cannot download %s. Exit here." % pkg)
 
 def setup(**kwargs):
@@ -83 +87 @@
 
     copy(os.path.join(data["pwd"], ".."), os.path.join(target, "sh"), dbg)
-    download(target, "locsat")
-    download(target, "fk")
+    download(target, "locsat", dbg)
+    download(target, "fk", dbg)
 
-    install(target)
-    customize(target)
+    exitcode = install(target, dbg)
+    if exitcode == 99:
+        abort("Installation aborted.")
+    elif exitcode:
+        abort("Installation errors occured. Please check output.")
 
-def customize(target):
+    customize(target, dbg)
+
+def customize(target, dbg):
     """
     Offers usage of new configuration files.
@@ -97 +106 @@
 
     flist = ["STATINF.DAT", "sensitivities.txt", "filter_lookup.txt"]
-
-    print "\nA backup of your shm-config.txt has been saved under"
-    print " %s/sh/inputs/shm-config.txt.yours" % target
 
     print "\nSeismic Handler comes with updated station configuration files."
@@ -117 +123 @@
         os.system("cp %s %s" % (tname+".dist", tname))
 
-def install(target):
-    os.system(os.path.join(target, "sh/setup/SHM-install.csh %s" % target))
+def install(target, dbg):
+    exitcode = \
+         os.system(os.path.join(target, "sh/setup/SHM-install.csh %s" % target))
+
+    return exitcode >> 8
 
 def copy(src, trt, dbg=False):