Changeset 194 for tools

Timestamp:

03/31/10 12:35:16 (15 years ago)

Author:

ogrimm

Message:

Update to Logon script

File:

• tools/Scripts/Logon (modified) (2 diffs)

tools/Scripts/Logon

@@ -1 +1 @@
 #!/bin/bash
 
-# This script should be sourced in .bashrc
+# This script should be sourced at log on (e.g. in .bashrc)
 
-export DIM_DNS_NODE=ihp-pc1.ethz.ch
+export REPOS_DIR=$(cd "${0%/*}/../.." 2>/dev/null; echo "$PWD")
+if [ -z "$DIM_DNS_NODE" ]; then export DIM_DNS_NODE=ihp-pc1.ethz.ch; fi
 export DIM_HOST_NODE=$HOST.ethz.ch
-export DIMDIR=/usr/local/dim_v19r9/
+if [ -z "$DIMDIR" ]; then export DIMDIR=/usr/local/dim/; fi
 
 export LD_LIBRARY_PATH=/usr/local/qwt-5.2.0/lib:$DIMDIR/linux:$LD_LIBRARY_PATH
-export PATH=$DIMDIR/linux:/home/daqct3/fact_repos.svn/tools/Scripts:/usr/local/Trolltech/Qt-4.4.3/bin:.:$PATH
+export PATH=$DIMDIR/linux:$REPOS_DIR/tools/Scripts:/usr/local/Trolltech/Qt-4.4.3/bin:.:$PATH
 
 echo
-echo Note: hvcontrol needs Evidence configuration server running on $DIM_DNS_NODE
+echo Note: Operation needs Evidence configuration server running on $DIM_DNS_NODE
 echo "To start, log on as user 'daqct3' and execute 'start' script"
-echo Contact: Oliver Grimm, 32192
+echo "Contact: Oliver Grimm (32192) or Quirin Weitzel (33973)"
 echo
 
@@ -19 +20 @@
 # The revision warning is given only once at login.
 
-if  [[ "${USER}" == "daqct3" ]]; then
-if shopt -q login_shell; then
-if [[ `svnversion fact_repos*/drsdaq -n` =~ [:M] ]]
-  then
+if [ "${USER}" = "daqct3" ]; then
+#if shopt -q login_shell; then
+if [[ `svnversion $REPOS_DIR/drsdaq -n` == *:* ]] || [[ `svnversion $REPOS_DIR/drsdaq -n` == *M ]]; then
     xterm -e "echo 'Warning: drsdaq in repository does not have a single revision number';
     echo 'Make an update before starting a run!';
-    echo 'Contact O.Grimm, T.Kraehenbuehl, or Q.Weitzel in case you need help';
+    echo 'Contact O.Grimm or Q.Weitzel in case you need help';
     echo 'Hit return to continue';
     read;"
+#fi
 fi
 fi
-fi