Changeset 369


Ignore:
Timestamp:
04/07/2011 03:14:30 PM (12 years ago)
Author:
marcus
Message:

MERGE: [364:368/SH_SHM/trunk]

Location:
SH_SHM/branches/2011.2
Files:
3 edited
2 copied

Legend:

Unmodified
Added
Removed
  • SH_SHM/branches/2011.2/setup/SHM-install.csh

    r346 r369  
    159159endif 
    160160set locsatpath=$dstpath/sh/util/locsat 
     161chmod 755 $locsatpath 
    161162set plth=`echo $locsatpath | wc -c` 
    162 if  ($plth > 25)  then 
    163         if  (-e $HOME/lcs)  \rm $HOME/lcs 
     163 
     164# check for write access in /usr/bin -> create link for binary 
     165if (-w /usr/bin) then 
     166    if  (-e /usr/bin/LocSAT) \rm /usr/bin/LocSAT 
     167    ln -s $locsatpath /usr/bin/LocSAT 
     168    set locsatpath=/usr/bin/LocSAT 
     169# otherwise create link directly into user dir 
     170else if ($plth > 25)  then 
     171        if  (-e $HOME/lcs) \rm $HOME/lcs 
    164172        ln -s $locsatpath $HOME/lcs 
    165173        set locsatpath=$HOME/lcs 
  • SH_SHM/branches/2011.2/setup/decompress.sh

    r364 r369  
    77echo "Please read and execute all installation instructions for your" 
    88echo "operating system as explained at the Seismic Handler project website:" 
    9 echo "http://www.seismic-handler.org/portal/wiki/ShmSeismicHandler" 
     9echo "http://www.seismic-handler.org/portal/wiki/Installation" 
    1010echo "" 
    1111read -p "Did you execute all neccessary steps (type 'yes')? " yes 
  • SH_SHM/branches/2011.2/setup/setup.py

    r364 r369  
    4242    print "Downloading %s..." % pkg 
    4343 
    44     verbose = "" 
     44    verbose = "-q " 
    4545    if dbg: 
    46         verbose = "-q " 
     46        verbose = "" 
    4747        print downloads[pkg] 
    4848 
Note: See TracChangeset for help on using the changeset viewer.