- README updated with more information about the proxy environment
  varialbes
- no_proxy/NO_PROXY removed from variables being set, it was being used
  incorrectly
diff --git a/plugins/proxy/README.md b/plugins/proxy/README.md index
819d032..3086618 100644 --- a/plugins/proxy/README.md +++
b/plugins/proxy/README.md @@ -2,7 +2,14 @@ proxy plugin ============

 The proxy plugin provides a couple helper functions to those of us who
 are -stuck behind HTTP/HTTPS/FTP proxies that require authentication.
 +stuck behind HTTP/HTTPS/FTP proxies that require authentication.  The
 variables +it exports are used by many command-line and GUI
 applications on Linux, as well +as [MacPorts][1] and [Homebrew][2] on
 OS X.  + +Both uppercase and lowercase versions of the proxy
 environment variables are +set, some applications are case sensitive.
 If you'd like to learn more about +the use of these variables, this
 [Arch Wiki Article][3] is a good place to +start.

 ## Usage

@@ -28,7 +35,6 @@ The proxy plugin will prepend `http://` for you.
Here's the result: ftp_proxy http://myproxy.example.com:8000 http_proxy
http://myproxy.example.com:8000 https_proxy
http://myproxy.example.com:8000
-    no_proxy http://myproxy.example.com:8000

 ### With authentication

@@ -43,3 +49,7 @@ for a password and setup your environment.  If you
didn't setup a proxy_user variable, you will be prompted for a username.

 If you wish to clear your proxy variables, run `noproxy`.  + +[1]:
 http://www.macports.org/ +[2]: http://brew.sh/ +[3]:
 https://wiki.archlinux.org/index.php/proxy_settings
diff --git a/plugins/proxy/_proxy_set.fish b/plugins/proxy/_proxy_set.fish
index b692bf0..e55d29e 100644
--- a/plugins/proxy/_proxy_set.fish
+++ b/plugins/proxy/_proxy_set.fish
@@ -1,8 +1,10 @@
 function _proxy_set -a proxy \
   -d "Set all proxy vars to specified value"

-  set -l envars http_proxy ftp_proxy https_proxy all_proxy no_proxy \
-    HTTP_PROXY HTTPS_PROXY FTP_PROXY NO_PROXY ALL_PROXY
+  set -l envars http_proxy HTTP_PROXY \
+    https_proxy HTTPS_PROXY \
+    ftp_proxy FTP_PROXY \
+    all_proxy ALL_PROXY
   for envar in $envars
     if test $proxy = '-e'
       set -e $envar