X-Git-Url: https://code.delx.au/osx-proxyconf/blobdiff_plain/73f9aaa62ddd095db672645a5876fa9934abfba2..547a899096639937bb0dee69a2b8ea03786c8b24:/proxyconf.sh

diff --git a/proxyconf.sh b/proxyconf.sh
index 61b0f50..5c49ada 100755
--- a/proxyconf.sh
+++ b/proxyconf.sh
@@ -1,17 +1,29 @@
 #!/bin/bash
 
-if [ "$(sysconfig -n "HTTPEnable")" -eq 1 ]; then
-	host="$(sysconfig -s "HTTPProxy")"
-	port="$(sysconfig -n "HTTPPort")"
+if [ "$(sysconfig -q "HTTPEnable")" = "1" ]; then
+	host="$(sysconfig -q "HTTPProxy")"
+	port="$(sysconfig -q "HTTPPort")"
 	echo "export http_proxy=\"http://${host}:${port}\""
+else
+	echo "unset http_proxy"
 fi
-if [ "$(sysconfig -n "HTTPSEnable")" -eq 1 ]; then
-	host="$(sysconfig -s "HTTPSProxy")"
-	port="$(sysconfig -n "HTTPSPort")"
+if [ "$(sysconfig -q "HTTPSEnable")" = "1" ]; then
+	host="$(sysconfig -q "HTTPSProxy")"
+	port="$(sysconfig -q "HTTPSPort")"
 	echo "export https_proxy=\"http://${host}:${port}\""
+else
+	echo "unset https_proxy"
 fi
-if [ "$(sysconfig -n "FTPEnable")" -eq 1 ]; then
-	host="$(sysconfig -s "FTPProxy")"
-	port="$(sysconfig -n "FTPPort")"
+if [ "$(sysconfig -q "FTPEnable")" = "1" ]; then
+	host="$(sysconfig -q "FTPProxy")"
+	port="$(sysconfig -q "FTPPort")"
 	echo "export ftp_proxy=\"http://${host}:${port}\""
+else
+	echo "unset ftp_proxy"
+fi
+if [ -n "${host}" ]; then
+	no_proxy="$(sysconfig ExceptionsList | tr '\n' ',' | sed 's/,$//g')"
+	echo "export no_proxy=\"${no_proxy}\""
+else
+	echo "unset no_proxy"
 fi