Changeset 338

Timestamp:

03/03/2011 02:50:09 PM (12 years ago)

Author:

marcus

Message:

r177 | walther | 2011-03-03 14:31:05 +0100 (Do, 03 Mär 2011) | 1 line

Some updates for installation scripts.

Location:

SH_SHM/trunk

Files:

• inputs/shm-config-default.txt (modified) (2 diffs)
• setup/SHM-install.csh (modified) (2 diffs)
• setup/setup.py (modified) (3 diffs)
• setup/shsetup.sh.template (modified) (1 diff)

SH_SHM/trunk/inputs/shm-config-default.txt

@@ -36 +36 @@
 !                            graphical editor used for displaying text files
 !                            type: text string
-texteditor                   nedit
+texteditor                   ##EDITOR##
 
 !                            trace normalisation
@@ -432 +432 @@
 !                            http://www.seismic-handler.org/portal/wiki/ShReads#qualifiers
 reads_swap                   false
-reads_invhdr                 true
+reads_invhdr                 false
 
 !                            debug level; 0 = no debug output, 1 = little

SH_SHM/trunk/setup/SHM-install.csh

@@ -212 +212 @@
 set thissetup=$dstpath/sh/inputs/shm-config.txt
 if  (-e $thissetup)  \mv $thissetup $dstpath/sh/inputs/shm-config.txt.yours
-cp $origsetup $thissetup
+sed "s@##EDITOR##@$editor@" $origsetup > $thissetup
 
 # settings for small displays (laptops)
@@ -297 +297 @@
 echo ""
 echo ""
-echo "Please call"
-echo ""
+echo "Please update your environment before using SH or SHM!"
+echo ""
+echo "If you prefer csh or tcsh put this line into your ~/.cshrc file:"
 echo "source $dstpath/sh/setup/shsetup"
 echo ""
-echo "before using SH or SHM.  Put this line into your .cshrc file"
-echo ""
+echo "If you prefer bash put this line into your ~/.bashrc file:"
+echo "source $dstpath/sh/setup/shsetup.sh"
+echo ""

SH_SHM/trunk/setup/setup.py

@@ -21 +21 @@
     if not tmp:
         tmp = pwd
-        
+
     uid = os.getuid()
     root = uid == 0
@@ -34 +34 @@
 def banner():
     print "="*78
-    print "  Setup program for Seismic Handler v0.1"
+    print "  Setup program v0.1 for Seismic Handler (SH/SHM)"
     print "="*78
     print "\n This piece of software will try to setup the included source code.\n"
@@ -73 +73 @@
                 if dbg:
                     print e
-                    
+
                 print "Cannot create target directory: %s" % target
                 continue

SH_SHM/trunk/setup/shsetup.sh.template

@@ -107 +107 @@
 # for SHM
 #
-alias SHM='(export UIDPATH $shcroot/source/motif/shm_world.uid; $shcroot/source/motif/shm_world)'
-alias SHM_N='(export UIDPATH $shcroot/source/motif/shm.uid; $shcroot/source/motif/shm)'
+alias SHM='(export UIDPATH=$shcroot/source/motif/shm_world.uid; $shcroot/source/motif/shm_world)'
+alias SHM_N='(export UIDPATH=$shcroot/source/motif/shm.uid; $shcroot/source/motif/shm)'
 #
 # for utility programs of SHM