X-Git-Url: http://git.iain.cx/?p=profile.git;a=blobdiff_plain;f=.profile.d%2Fproxy.bashrc;h=746a8972bc24cfd37da8731fa56515ccaaf61560;hp=811fcbdb632083287dbcf8e06f2011c9c8e328e1;hb=d2bb143d0545987c58f65a8b18c502f792f3f748;hpb=3638b2ac8e2e40888dae60233cc85f46de037acd

diff --git a/.profile.d/proxy.bashrc b/.profile.d/proxy.bashrc
index 811fcbd..746a897 100644
--- a/.profile.d/proxy.bashrc
+++ b/.profile.d/proxy.bashrc
@@ -1,13 +1,14 @@
-# $Id$
 # Read proxy information from Subversion if possible.
 
 servers=~/.subversion/servers
 
-if [ -r "$servers" ]; then
+if [ -O "$servers" ]; then
   eval $(sed -n '/^\[global\]/,/^\[/s/^http-proxy-\([^= ]*\) *= *\(.*\)/proxy_\1="\2"/p' "$servers")
   creds=""
-  [ ! -z "$proxy_username" ] && creds="$proxy_username:$proxy_password@"
-  export http_proxy="http://$creds$proxy_host:${proxy_port:-80}"
+  if [ ! -z "$proxy_host" ]; then
+    [ ! -z "$proxy_username" ] && creds="$proxy_username:$proxy_password@"
+    export http_proxy="http://$creds$proxy_host:${proxy_port:-80}"
+  fi
 fi
 
 unset proxy_username proxy_password proxy_host proxy_port creds servers