]> code.delx.au - osx-proxyconf/blobdiff - proxyconf.sh
Removed unneeded code
[osx-proxyconf] / proxyconf.sh
index 261ffbe3c7fdbc11b618aea084f57c1ed61a0899..a2583a6151736d72b0e35195ec10bef89740597a 100755 (executable)
@@ -1,21 +1,28 @@
 #!/bin/bash
 
-if [ "$(sysconfig -q "HTTPEnable")" = "1" ]; then
-       host="$(sysconfig -q "HTTPProxy")"
-       port="$(sysconfig -q "HTTPPort")"
-       echo "export http_proxy=\"http://${host}:${port}\""
-fi
-if [ "$(sysconfig -q "HTTPSEnable")" = "1" ]; then
-       host="$(sysconfig -q "HTTPSProxy")"
-       port="$(sysconfig -q "HTTPSPort")"
-       echo "export https_proxy=\"http://${host}:${port}\""
-fi
-if [ "$(sysconfig -q "FTPEnable")" = "1" ]; then
-       host="$(sysconfig -q "FTPProxy")"
-       port="$(sysconfig -q "FTPPort")"
-       echo "export ftp_proxy=\"http://${host}:${port}\""
-fi
-if [ -n "${host}" ]; then
-       no_proxy="$(sysconfig ExceptionsList | tr '\n' ',' | sed 's/,$//g')"
+function printEnvironment() {
+       local proxy_type="$1"
+       local environment_variable="$2"
+       local uri_prefix="${3:-http}"
+       local host port
+
+       if [ "$(sysconfig -q "${proxy_type}Enable")" = "1" ]; then
+               host="$(sysconfig -q "${proxy_type}Proxy")"
+               port="$(sysconfig -q "${proxy_type}Port")"
+               echo "export ${environment_variable}='${uri_prefix}://${host}:${port}'"
+       else
+               echo "unset ${environment_variable}"
+       fi
+
+}
+printEnvironment "HTTP" "http_proxy"
+printEnvironment "HTTPS" "https_proxy"
+printEnvironment "FTP" "ftp_proxy"
+printEnvironment "SOCKS" "socks_proxy" "socks"
+
+no_proxy="$(sysconfig -q ExceptionsList)"
+if [ ! -z "${no_proxy}" ]; then
        echo "export no_proxy=\"${no_proxy}\""
+else
+       echo "unset no_proxy"
 fi