From: James Bunton <jamesbunton@fastmail.fm>
Date: Sun, 30 Mar 2008 10:43:19 +0000 (+1100)
Subject: Now I see why PROXY_FOUND was needed :P
X-Git-Url: https://code.delx.au/osx-proxyconf/commitdiff_plain/cc2033928358c37875bf344a107b3df989cb991a

Now I see why PROXY_FOUND was needed :P
---

diff --git a/proxyconf.sh b/proxyconf.sh
index a2583a6..dc9c86e 100755
--- a/proxyconf.sh
+++ b/proxyconf.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+PROXY_FOUND=0
 function printEnvironment() {
 	local proxy_type="$1"
 	local environment_variable="$2"
@@ -10,6 +11,8 @@ function printEnvironment() {
 		host="$(sysconfig -q "${proxy_type}Proxy")"
 		port="$(sysconfig -q "${proxy_type}Port")"
 		echo "export ${environment_variable}='${uri_prefix}://${host}:${port}'"
+
+		PROXY_FOUND=1
 	else
 		echo "unset ${environment_variable}"
 	fi
@@ -21,7 +24,7 @@ printEnvironment "FTP" "ftp_proxy"
 printEnvironment "SOCKS" "socks_proxy" "socks"
 
 no_proxy="$(sysconfig -q ExceptionsList)"
-if [ ! -z "${no_proxy}" ]; then
+if [ -n "${no_proxy}" -a $PROXY_FOUND -eq 1 ]; then
 	echo "export no_proxy=\"${no_proxy}\""
 else
 	echo "unset no_proxy"