Commit 7362112b authored by Stefano Belforte's avatar Stefano Belforte
Browse files

improve reporting

parent 3ef6ff84
...@@ -109,7 +109,9 @@ if [ $isEGEE == 1 ]; then ...@@ -109,7 +109,9 @@ if [ $isEGEE == 1 ]; then
echo "ERROR: GLITE_WMS_LOCATION not defined" echo "ERROR: GLITE_WMS_LOCATION not defined"
echo "</h3>" echo "</h3>"
else else
echo "<h3>"
echo "GLITE_WMS_LOCATION =" $GLITE_WMS_LOCATION echo "GLITE_WMS_LOCATION =" $GLITE_WMS_LOCATION
echo "</h3>"
filetosource=${GLITE_WMS_LOCATION}/etc/profile.d/grid-env.sh filetosource=${GLITE_WMS_LOCATION}/etc/profile.d/grid-env.sh
echo "<pre>"; set -x echo "<pre>"; set -x
ls -l ${GLITE_WMS_LOCATION} ls -l ${GLITE_WMS_LOCATION}
...@@ -118,7 +120,7 @@ if [ $isEGEE == 1 ]; then ...@@ -118,7 +120,7 @@ if [ $isEGEE == 1 ]; then
set +x; echo "</pre>" set +x; echo "</pre>"
if [ -r "$filetosource" ]; then if [ -r "$filetosource" ]; then
source "$filetosource" &>/dev/null source "$filetosource" &>/dev/null
[ -r `which lcg-ls` ] && echo "<p><strong>lcg-ls found !</strong><p> as " `which lcg-ls` [ -r `which lcg-ls` ] && echo "<p><strong>lcg-ls found ! as " `which lcg-ls` "</strong><p>"
which lcg-ls > /dev/null && lcglsOK=1 which lcg-ls > /dev/null && lcglsOK=1
fi fi
fi fi
...@@ -165,13 +167,18 @@ if [ $isOSG == 1 ]; then ...@@ -165,13 +167,18 @@ if [ $isOSG == 1 ]; then
[ -r `which lcg-ls` ] && echo "<p><strong>lcg-ls -R found ! as " `which lcg-ls` "</strong><p>" [ -r `which lcg-ls` ] && echo "<p><strong>lcg-ls -R found ! as " `which lcg-ls` "</strong><p>"
which lcg-ls > /dev/null && lcglsOK=1 which lcg-ls > /dev/null && lcglsOK=1
fi fi
fi
fi
if [ $lcglsOK == 1 ] ; then
echo "<h2>"
echo "OK, lcg-ls is set in the end as"
echo "</h2>"
echo "<pre>" echo "<pre>"
set -x
which lcg-ls which lcg-ls
ls -l `which lcg-ls` ls -l `which lcg-ls`
set +x
echo "</pre>" echo "</pre>"
fi exit $SAME_OK
else
exit $SAME_WARNING
fi fi
exit $SAME_OK
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment