certi myCERTI_env.csh.in myCERTI_env.sh.in

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Eric NOULARD <erk>      07/10/29 08:09:44

Modified files:
        .              : myCERTI_env.csh.in myCERTI_env.sh.in 

Log message:
        Now csh and sh should be 'equivalent'
        I did suppress the NBITs thing which was only
        usable on Linux

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/myCERTI_env.csh.in?cvsroot=certi&r1=3.2&r2=3.3
http://cvs.savannah.gnu.org/viewcvs/certi/myCERTI_env.sh.in?cvsroot=certi&r1=1.4&r2=1.5

Patches:
Index: myCERTI_env.csh.in
===================================================================
RCS file: /sources/certi/certi/myCERTI_env.csh.in,v
retrieving revision 3.2
retrieving revision 3.3
diff -u -b -r3.2 -r3.3
--- myCERTI_env.csh.in  28 Oct 2007 23:27:28 -0000      3.2
+++ myCERTI_env.csh.in  29 Oct 2007 08:09:44 -0000      3.3
@@ -23,12 +23,13 @@
 # 3 Architecture (i.e 32 or 64 bits)
 
 setenv ARCH `uname -m`
-if ( $ARCH == "x86_64" ) then
-    setenv NBITS 64
-else
-    setenv NBITS 32
-endif
-echo "Current machine architecture is <$ARCH> assumed to be $NBITS bits."
+#if ( $ARCH == "x86_64" ) then
+#    setenv NBITS 64
+#else
+#    setenv NBITS 32
+#endif
+echo "Current machine architecture is <$ARCH>."
+# assumed to be $NBITS bits."
 
 # 4 CERTI_HOME (i.e. where we find bin,lib,share,include about CERTI built)
 setenv CERTI_HOME @prefix@

Index: myCERTI_env.sh.in
===================================================================
RCS file: /sources/certi/certi/myCERTI_env.sh.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- myCERTI_env.sh.in   28 Oct 2007 23:27:28 -0000      1.4
+++ myCERTI_env.sh.in   29 Oct 2007 08:09:44 -0000      1.5
@@ -29,17 +29,16 @@
 # 3 Architecture (i.e 32 or 64 bits)
 
 ARCH=`uname -m`
-if [ "$ARCH" = "i686" ];
-then
-  NBITS="32bits"
-else
-  NBITS="64bits"
-fi
-
-echo "Current machine architecture is <$ARCH> assumed to be $NBITS"
+#if [ "$ARCH" = "i686" ];
+#then
+#  NBITS="32bits"
+#else
+# NBITS="64bits"
+#fi
+echo "Current machine architecture is <$ARCH>".
+# assumed to be $NBITS"
 
 # 4 CERTI_HOME (i.e. where we find bin,lib,share,include about CERTI built)
-
 export address@hidden@
 alias go_certi_home='pushd $CERTI_HOME'
 
@@ -48,13 +47,31 @@
 alias go_certi_fed='pushd $CERTI_FED'
 
 # 6 PATH (i.e. to run easily rtig and s.o.)
-# Note sometimes PATH is not modified
-
-export PATH=$PATH:$CERTI_HOME/bin:$CERTI_HOME/scripts
+# Not PATH is not modified
+# if to be added PATH is already there
+MOREPATHBIN=$CERTI_HOME/bin
+MODIFPATH=`echo $PATH | grep $MOREPATHBIN`
+if [ -z "$MODIFPATH" ];
+then
+       export PATH=$MOREPATHBIN:$PATH
+       echo "Your PATH variable has been modified for bin"
+fi
+MOREPATHSCRIPTS=$CERTI_HOME/scripts
+MODIFPATH=`echo $PATH | grep $MOREPATHSCRIPTS`
+if [ -z "$MODIFPATH" ];
+then
+       export PATH=$MOREPATHSCRIPTS:$PATH
+       echo "Your PATH variable has been modified for scripts"
+fi
 
 # 7 LD_LIBRARY_PATH ( applications needs...)
 # Note LD_LIBRARY_PATH has to be extended sometimes
-export LD_LIBRARY_PATH=$CERTI_HOME/lib:$LD_LIBRARY_PATH
+MOREPATHLIB=$CERTI_HOME/lib
+MODIFPATH=`echo $LD_LIBRARY_PATH | grep $MOREPATHLIB`
+if [ -z "$MODIFPATH" ];
+then
+    export LD_LIBRARY_PATH=$MOREPATHLIB:$LD_LIBRARY_PATH
+fi
 
 echo "=========================================================="
 echo "** WARNING ** We hope you have made source myCERTI.sh **"