slicPandora

diff -u -r1.8 -r1.9
--- make_setup_script.sh	6 Oct 2010 21:23:14 -0000	1.8
+++ make_setup_script.sh	5 Nov 2010 13:12:32 -0000	1.9
@@ -18,32 +18,31 @@

 echo "PANDORAPFA=$PANDORAPFA"
 echo "LCIO=$LCIO"
 

-echo -e \

+echo \

 "#!/bin/bash
 export PANDORAPFA=$PANDORAPFA" > mysetup.sh
 
 # lib path for basic deps

-echo -e \

+echo \

 "export LCIO=$LCIO
 export LD_LIBRARY_PATH=\${PANDORAPFA}/lib:\${LCIO}/lib:${PWD}/lib:\${LD_LIBRARY_PATH}" >> mysetup.sh
 
 # Pandora Monitoring
 if [ -n "$PANDORAMONITORING" ]; then

+    echo "USE_PANDORAMONITORING=1" >> mysetup.sh

     echo "PANDORAMONITORING=$PANDORAMONITORING"

-    echo -e "export PANDORAMONITORING=$PANDORAMONITORING" >> mysetup.sh
-    echo -e "export LD_LIBRARY_PATH=\${PANDORAMONITORING}/lib:\${LD_LIBRARY_PATH}" >> mysetup.sh

+    echo "export PANDORAMONITORING=$PANDORAMONITORING" >> mysetup.sh
+    echo "export LD_LIBRARY_PATH=\${PANDORAMONITORING}/lib:\${LD_LIBRARY_PATH}" >> mysetup.sh

 else

-    echo "The PANDORAMONITORING variable is not set."
-    exit 1

+    echo "WARNING: The PANDORAMONITORING variable is not set."

 fi
 
 # ROOT
 if [ -n "$ROOTSYS" ]; then
     echo "ROOTSYS=$ROOTSYS"
     echo "export ROOTSYS=$ROOTSYS" >> mysetup.sh

-    echo -e "export LD_LIBRARY_PATH=\${ROOTSYS}/lib:\${LD_LIBRARY_PATH}" >> mysetup.sh
-    echo -e "export PATH=\${ROOTSYS}/bin:\${PATH}" >> mysetup.sh

+    echo "export LD_LIBRARY_PATH=\${ROOTSYS}/lib:\${LD_LIBRARY_PATH}" >> mysetup.sh
+    echo "export PATH=\${ROOTSYS}/bin:\${PATH}" >> mysetup.sh

 else

-    echo "The ROOTSYS variable is not set."
-    exit 1

+    echo "WARNING: The ROOTSYS variable is not set."

 fi