Include proper conditional checks for CVMFS detection

Minor change in the error message

etc/submit.sh

@@ -8,16 +8,14 @@ echo "WMAgent bootstrap : `date -u` : starting..."
 
 # validate arguments
 
-if [ "x" = "x$1" ]
-then
-	echo "WMAgent bootstrap : `date -u` : Error: A sandbox must be specified" >&2
-	exit 1
+if [ -z "$1" ];then
+    echo "WMAgent bootstrap : `date -u` : Error: A sandbox must be specified" >&2
+    exit 1
 fi
 
-if [ "x" = "x$2" ]
-then
-	echo "WMAgent bootstrap : `date -u` : Error: An index must be specified" >&2
-	exit 1
+if [ -z "$2" ];then
+    echo "WMAgent bootstrap : `date -u` : Error: An index must be specified" >&2
+    exit 1
 fi
 
 # assign arguments
@@ -28,36 +26,43 @@ echo "WMAgent bootstrap : `date -u` : arguments validated..."
 
 ### source the CMSSW stuff using either OSG or LCG style entry env. variables
 ###    (incantations per oli's instructions)
-#   LCG style --
-if [ "x" != "x$VO_CMS_SW_DIR" ]
-then
-	. $VO_CMS_SW_DIR/cmsset_default.sh
 
-#   OSG style --
-elif [ "x" != "x$OSG_APP" ]
-then
-	. $OSG_APP/cmssoft/cms/cmsset_default.sh CMSSW_3_3_2
-elif [ "x" != "x$CVMFS" ]
-then
+if [ -f "$VO_CMS_SW_DIR"/cmsset_default.sh ];then  #   LCG style --
+    . $VO_CMS_SW_DIR/cmsset_default.sh
+elif [ -f "$OSG_APP"/cmssoft/cms/cmsset_default.sh ];then  #   OSG style --
+    . $OSG_APP/cmssoft/cms/cmsset_default.sh CMSSW_3_3_2
+elif [ -f "$CVMFS"/cms.cern.ch/cmsset_default.sh ];then
     . $CVMFS/cms.cern.ch/cmsset_default.sh
-elif [ -f /cvmfs/cms.cern.ch/cmsset_default.sh ]
-then
+elif [ -f /cvmfs/cms.cern.ch/cmsset_default.sh ];then
     . /cvmfs/cms.cern.ch/cmsset_default.sh
 else
-	echo "WMAgent bootstrap : `date -u` : Error: OSG_APP, VO_CMS_SW_DIR, CVMFS environment variables were set and /cvmfs is not present" >&2
-	echo "WMAgent bootstrap : `date -u` : Error: Because of this, we can't load CMSSW. Not good." >&2
-	exit 2
+    echo "WMAgent bootstrap : `date -u` : Error: OSG_APP, VO_CMS_SW_DIR, CVMFS environment variables were not set and /cvmfs is not present" >&2
+    echo "WMAgent bootstrap : `date -u` : Error: Because of this, we can't load CMSSW. Not good." >&2
+    exit 2
 fi
+
 echo "WMAgent bootstrap : `date -u` : WMAgent thinks it found the correct CMSSW setup script"
 
-if [ -e $VO_CMS_SW_DIR/COMP/slc5_amd64_gcc434/external/python/2.6.4/etc/profile.d/init.sh ]
+if [ -e "$VO_CMS_SW_DIR"/COMP/slc5_amd64_gcc434/external/python/2.6.4/etc/profile.d/init.sh ]
+then
+        . "$VO_CMS_SW_DIR"/COMP/slc5_amd64_gcc434/external/python/2.6.4/etc/profile.d/init.sh 
+	export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"$VO_CMS_SW_DIR"/COMP/slc5_amd64_gcc434/external/openssl/0.9.7m/lib:"$VO_CMS_SW_DIR"/COMP/slc5_amd64_gcc434/external/bz2lib/1.0.5/lib
+elif [ -e "$OSG_APP"/cmssoft/cms/COMP/slc5_amd64_gcc434/external/python/2.6.4/etc/profile.d/init.sh ]
 then
-	. $VO_CMS_SW_DIR/COMP/slc5_amd64_gcc434/external/python/2.6.4/etc/profile.d/init.sh 
-	export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$VO_CMS_SW_DIR/COMP/slc5_amd64_gcc434/external/openssl/0.9.7m/lib:$VO_CMS_SW_DIR/COMP/slc5_amd64_gcc434/external/bz2lib/1.0.5/lib
-elif [ -e $OSG_APP/cmssoft/cms/COMP/slc5_amd64_gcc434/external/python/2.6.4/etc/profile.d/init.sh ]
+	. "$OSG_APP"/cmssoft/cms/COMP/slc5_amd64_gcc434/external/python/2.6.4/etc/profile.d/init.sh
+	export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"$OSG_APP"/cmssoft/cms/COMP/slc5_amd64_gcc434/external/openssl/0.9.7m/lib:"$OSG_APP"/cmssoft/cms/COMP/slc5_amd64_gcc434/external/bz2lib/1.0.5/lib
+elif [ -e "$CVMFS"/cms.cern.ch/slc5_amd64_gcc462/external/python/2.6.4/etc/profile.d/init.sh ]
 then
-	. $OSG_APP/cmssoft/cms/COMP/slc5_amd64_gcc434/external/python/2.6.4/etc/profile.d/init.sh
-	export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$OSG_APP/cmssoft/cms/COMP/slc5_amd64_gcc434/external/openssl/0.9.7m/lib:$OSG_APP/cmssoft/cms/COMP/slc5_amd64_gcc434/external/bz2lib/1.0.5/lib
+    . "$CVMFS"/cms.cern.ch/slc5_amd64_gcc462/external/python/2.6.4/etc/profile.d/init.sh
+    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"$CVMFS"/cms.cern.ch/slc5_amd64_gcc462/external/openssl/0.9.8e/lib:"$CVMFS"/cms.cern.ch/slc5_amd64_gcc434/external/bz2lib/1.0.5/lib
+elif [ -e /cvmfs/cms.cern.ch/slc5_amd64_gcc462/external/python/2.6.4/etc/profile.d/init.sh ]
+then
+    . /cvmfs/cms.cern.ch/slc5_amd64_gcc462/external/python/2.6.4/etc/profile.d/init.sh
+    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/cvmfs/cms.cern.ch/slc5_amd64_gcc462/external/openssl/0.9.8e/lib:/cvmfs/cms.cern.ch/slc5_amd64_gcc434/external/bz2lib/1.0.5/lib
+else
+    echo "WMAgent bootstrap : `date -u` : Error: OSG_APP, VO_CMS_SW_DIR, CVMFS, /cvmfs/cms.cern.ch environment does not contain init.sh" >&2
+    echo "WMAgent bootstrap : `date -u` : Error: Because of this, we can't load CMSSW. Not good." >&2
+    exit 4
 fi
 command -v python2.6 > /dev/null
 rc=$?