proxyconf.sh can now find sysconfig as long as they are in the same dir (even

[osx-proxyconf] / proxyconf.sh

diff --git a/proxyconf.sh b/proxyconf.sh
index 262dfc8c934a7356edf79401196f069fe31849d6..a6b7d23ff822b85e9e05794c51499bf0bd3cea0c 100755 (executable)
--- 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"