Prepare OSG check for CVMFS, some cosmetics.

SiteTests/testjob/tests/CE-cms-swinst

@@ -45,17 +45,32 @@ echo "</pre>"
 
 echo "<h2>Checking software directory for CMS VO</h2>"
 
-if [ -n "$OSG_APP" ] ; then
+if [ -n "$OSG_GRID" ] ; then
     isOSG=1
-    SW_DIR=$OSG_APP/cmssoft/cms
-    echo "<p>Checking variable: \$OSG_APP/cmssoft/cms=$OSG_APP/cmssoft/cms</p>"
+    echo "<p>OSG Middleware</p>"
+    if [ -d $OSG_APP/cmssoft/cms ] ;then
+         SW_DIR=$OSG_APP/cmssoft/cms
+         echo "<p>Checking variable: \$OSG_APP/cmssoft/cms=$OSG_APP/cmssoft/cms</p>"
+    elif [ -d $CVMFS/cms.cern.ch ] ; then
+         SW_DIR=$CVMFS/cms.cern.ch
+         echo "<p>Checking variable: \$CVMFS/cms.cern.ch=$CVMFS/cms.cern.ch</p>"
+    elif [ -d /cvmfs/cms.cern.ch ] ; then
+         SW_DIR=/cvmfs/cms.cern.ch
+         echo "<p>Checking fallback location: /cvmfs/cms.cern.ch</p>"
+    else
+         echo "<p>"
+         echo "Cannot find CMS software area."
+         echo "</p>"
+         exit $SAME_ERROR
+    fi
 elif [ -n "$VO_CMS_SW_DIR" ] ; then
     isEGEE=1
+    echo "EMI or ARC middleware"
     SW_DIR=$VO_CMS_SW_DIR
     echo "<p>Checking variable: \$VO_CMS_SW_DIR=$VO_CMS_SW_DIR</p>"
 else
     echo "<p><strong>"
-    echo "ERROR: Neither VO_CMS_SW_DIR nor OSG_APP defined"
+    echo "ERROR: Neither VO_CMS_SW_DIR nor proper OSG variables defined"
     echo "</strong></p>"
     exit $SAME_ERROR
 fi
@@ -120,9 +135,9 @@ source $SW_DIR/cmsset_default.sh > /dev/null
 echo "Default SCRAM arch: $SCRAM_ARCH"
 echo "</pre>"
 archs_defined='slc5_ia32_gcc434 slc5_amd64_gcc434 slc5_amd64_gcc462'
-archs_to_test='slc5_amd64_gcc434 slc5_ia32_gcc434'
+archs_to_test='slc5_amd64_gcc434 slc5_amd64_gcc462'
 swok=0
-for arch in $archs_defined ; do
+for arch in $archs_to_test ; do
   if [ $swok != 1 ] ; then
     export SCRAM_ARCH=$arch
     export BUILD_ARCH=$arch
@@ -220,9 +235,10 @@ do
   echo "<p>OK</p>"
   echo "<p>"
   if [ -d $CMS_PATH/${arch}/cms/cms-common/1.0 ]; then
-    echo "New cms-common RPM already installed"
+    echo "Recent cms-common RPM already installed:"
+    ls -d $CMS_PATH/${arch}/cms/cms-common/1.0/* | grep -v etc
   else
-    echo "Old cms-common RPM installed"
+    echo "Old style cms-common RPM installed."
   fi
   echo "</p>"
 done