use cmsarch in addition to cmsos, put patch for CERN, cleanup log

SiteTests/testjob/tests/CE-cms-analysis

@@ -29,19 +29,27 @@ else
     echo "ERROR: Neither VO_CMS_SW_DIR nor OSG_APP defined"
     exit $SAME_ERROR
 fi
+if [ `uname -n|cut -d. -f2-` == "cern.ch" ] ; then
+    echo "running at CERN, hardset \$SW_DIR to /afs/cern.ch/cms/sw"
+    export SW_DIR=/afs/cern.ch/cms/sw/
+fi
+
+echo "CMS software location SW_DIR=" $SW_DIR
 tmpfile=`mktemp /tmp/tmp.XXXXXXXXXX`
 echo "<pre>"
 
-set -x
+
 # check for SL5
 libc25=1
 if ! [ -f $SW_DIR/common/cmsos ] ; then
- echo "$SW_DIR/bin/cmsos not found"
+ echo "$SW_DIR/common/cmsos not found - force to SL5"
  slVersion="slc5"
 else
  osVersion=`$SW_DIR/common/cmsos`
- echo "osVersion=" $osVersion
- slVersion=`echo $osVersion|cut -d'_' -f1`
+ echo "osVersion  from \$SW_DIR/common/cmsos  =" $osVersion
+ cmsarch=`$SW_DIR/common/cmsarch`
+ echo "scram_arch from \$SW_DIR/common/cmsarch=" $cmsarch
+ slVersion=`echo $cmsarch|cut -d'_' -f1`
 fi
 echo "slVersion=" $slVersion
 if ! [ -f /lib/libc-2.5.so ] ; then
@@ -49,7 +57,7 @@ if ! [ -f /lib/libc-2.5.so ] ; then
  libc25=0
 fi
 if ! [ $slVersion == "slc5" ] ; then
- echo "<h3> op.system = " $osVersion "not an SL5 machine </h3>"
+ echo "<h3> not an SL5 machine </h3>"
  exit $SAME_NOTICE
 fi
 
@@ -60,7 +68,7 @@ if  [ $libc25 == "0" ] ; then
  ls -l /lib/libc*
  exit $SAME_INFO
 fi
-set +x
+
 
 # this test requires SLC5 arch, currently
 export SCRAM_ARCH=slc5_ia32_gcc434