Commit 758a7525 authored by Andrea Sciaba's avatar Andrea Sciaba
Browse files

Fixed squid exception for RAL and less verbose wget

parent 17359a6f
......@@ -44,12 +44,12 @@ if [ -z $squidUrl ]
then
info=1
useSquid=0
echo "<h4>Failed to find squidUrl in $ConfigFile</h4>"
echo "<p>Failed to find squidUrl in $ConfigFile</p>"
else
useSquid=1
# squids at CERN, RAL and London, can only be used for FroNtier
( echo $squidUrl | grep -q cmst0frontier.*\.cern\.ch ) && useSquid=0
( echo $squidUrl | grep -q gridpp\.rl\.ac\.uk ) && useSquid=0
( echo $squidUrl | grep -q pp\.rl\.ac\.uk ) && useSquid=0
( echo $squidUrl | grep -q hep\.ph\.ic\.ac\.uk ) && useSquid=0
fi
[ $useSquid == 1 ] && export http_proxy=$squidUrl
......@@ -65,12 +65,12 @@ rc=$?
if [ $rc != 0 ]
then
note=1
echo "<h4>Failed to retrieve $file from $url</h4>"
echo "<p>Failed to retrieve $file from $url</p>"
echo "<pre>"
echo "$cmd"
echo "executed with exit code = $rc"
echo "execute again to stdout"
cmd="wget --user-agent="" --tries=1 --timeout=300 --no-check-certificate $url --output-document=$file"
cmd="wget -nv --user-agent="" --tries=1 --timeout=300 --no-check-certificate $url --output-document=$file"
cmdFile=`mktemp`
echo $cmd > $cmdFile
source $cmdFile
......
Markdown is supported
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