SlacMCPrj/scripts

diff -N setup-geant4-current.sh
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ setup-geant4-current.sh	19 Dec 2006 00:28:19 -0000	1.1
@@ -0,0 +1,4 @@

+#!/bin/sh
+
+export G4INSTALL=${PRJ_EXTERN}/geant4/geant4.8.2
+source ${PRJ_SCRIPTS}/setup-geant4.sh

SlacMCPrj/scripts

diff -u -r1.1 -r1.2
--- setup-geant4.8.1.p02.sh	17 Nov 2006 22:49:45 -0000	1.1
+++ setup-geant4.8.1.p02.sh	19 Dec 2006 00:28:19 -0000	1.2
@@ -1,4 +1,10 @@

 #!/bin/sh
 

-export G4INSTALL=${PRJ_EXTERN}/geant4/geant4.8.1.p02
-source ${PRJ_SCRIPTS}/setup-geant4.sh

+if [ -z "$G4INSTALL" ]; then
+  echo "ERROR: This script requires G4INSTALL to be set."
+  return 1
+fi
+
+. $G4INSTALL/.config/bin/$(uname)-g++/env.sh
+
+source setup-geant4-data.sh

SlacMCPrj/scripts

diff -u -r1.1 -r1.2
--- setup-geant4.sh	11 Jul 2005 18:43:37 -0000	1.1
+++ setup-geant4.sh	19 Dec 2006 00:28:19 -0000	1.2
@@ -1,19 +1,10 @@

 #!/bin/sh
 
 if [ -z "$G4INSTALL" ]; then

-  echo "ERROR: Must set G4INSTALL before proceeding."
-else
-  if [ -z "$G4SYSTEM" ]; then
-    G4SYSTEM=Linux-g++
-  fi
-
-  # source env 
-  source $G4INSTALL/.config/bin/$G4SYSTEM/env.sh

+  echo "ERROR: This script requires G4INSTALL to be set."
+  return 1
+fi

-  # main G4 libs area
-  export LD_LIBRARY_PATH=$G4LIB/$G4SYSTEM 

+. $G4INSTALL/.config/bin/$(uname)-g++/env.sh

-  # add two possible locations for physics list libs
-  export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$G4LIB/.lists_build/$G4SYSTEM
-  export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$G4LIB/plists/$G4SYSTEM
-fi

+source setup-geant4-data.sh