X-Git-Url: https://code.delx.au/osx-proxyconf/blobdiff_plain/deee4d1a95b776ad1234873fc2e33fd6817a0d81..cc2033928358c37875bf344a107b3df989cb991a:/proxyconf.sh

diff --git a/proxyconf.sh b/proxyconf.sh
index be37736..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
@@ -20,8 +23,8 @@ printEnvironment "HTTPS" "https_proxy"
 printEnvironment "FTP" "ftp_proxy"
 printEnvironment "SOCKS" "socks_proxy" "socks"
 
-no_proxy="$(sysconfig -q ExceptionsList | tr '\n' ',' | sed 's/,$//g')"
-if [ ! -z "${no_proxy}" ]; then
+no_proxy="$(sysconfig -q ExceptionsList)"
+if [ -n "${no_proxy}" -a $PROXY_FOUND -eq 1 ]; then
 	echo "export no_proxy=\"${no_proxy}\""
 else
 	echo "unset no_proxy"