[Pkg-grid-commits] gpt/debian/additions gpt.csh, 1.1, 1.2 gpt.sh, 1.1, 1.2

[Steffen Möller]

Update of /cvsroot/pkg-grid/gpt/debian/additions
In directory alioth:/tmp/cvs-serv18236/additions

Modified Files:
	gpt.csh gpt.sh 
Log Message:
Just added and already amended for the possibility of the gpt_location 
be identical to the GLOBUS_LOCATION /opt/globus.


Index: gpt.csh
===================================================================
RCS file: /cvsroot/pkg-grid/gpt/debian/additions/gpt.csh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gpt.csh	25 Mar 2008 15:08:07 -0000	1.1
+++ gpt.csh	25 Mar 2008 15:12:14 -0000	1.2
@@ -5,8 +5,13 @@
 endif
 
 if (! $?GPT_LOCATION ) then
-  set GPT_LOCATION=/opt/gpt
+  if ( -d /opt/globus ) then
+    set GPT_LOCATION=/opt/globus
+  endif
+  if ( -d /opt/gpt ) then
+    set GPT_LOCATION=/opt/gpt
+  endif
 endif
 
-setenv GPT_LOCATION /opt/gpt
+setenv GPT_LOCATION $GPT_LOCATION
 setenv PATH ${PATH}:$GPT_LOCATION/sbin

Index: gpt.sh
===================================================================
RCS file: /cvsroot/pkg-grid/gpt/debian/additions/gpt.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gpt.sh	25 Mar 2008 15:08:07 -0000	1.1
+++ gpt.sh	25 Mar 2008 15:12:14 -0000	1.2
@@ -1,6 +1,12 @@
 if test -f /etc/sysconfig/gpt ; then
   . /etc/sysconfig/gpt
 fi
-GPT_LOCATION=/opt/gpt
+if [ -z "$GPT_LOCATION" ]; then
+  if [ -d /opt/gpt ]; then
+	GPT_LOCATION=/opt/gpt
+  elif [ -d /opt/globus ]; then
+	GPT_LOCATION=/opt/globus
+  fi
+fi
 PATH=${PATH}:$GPT_LOCATION/sbin
 export GPT_LOCATION PATH