X-Git-Url: https://code.delx.au/osx-proxyconf/blobdiff_plain/6bbe912115fb3942bda67714ae542af4f7e8b60c..455327818f1ab19e2310c39c383db3d5be369841:/proxyconf.sh

diff --git a/proxyconf.sh b/proxyconf.sh
index be37736..262dfc8 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 | tr '\n' ',' | sed 's/,$//g')"
-if [ ! -z "${no_proxy}" ]; then
+if [ ! -z "${no_proxy}" ] && [ $PROXY_FOUND -ne 0 ]; then
 	echo "export no_proxy=\"${no_proxy}\""
 else
 	echo "unset no_proxy"