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

diff --git a/proxyconf.sh b/proxyconf.sh
index 262dfc8..a6b7d23 100755
--- a/proxyconf.sh
+++ b/proxyconf.sh
@@ -18,13 +18,17 @@ function printEnvironment() {
 	fi
 
 }
+
+
+PATH="$(dirname "$0"):${PATH}"
+
 printEnvironment "HTTP" "http_proxy"
 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}" ] && [ $PROXY_FOUND -ne 0 ]; 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"