More environment filtering tweaks

- only document HOMEBREW_* variables in the manpage (although still
  read from all the original environment variables).
- resort manpage environment variables in alphabetical order
- check the original path for trailing slashes

1 files changed, 4 insertions, 1 deletions

diff --git a/bin/brew b/bin/brew
index 306be5ea0..20cf9564d 100755
--- a/bin/brew
+++ b/bin/brew
@@ -44,7 +44,10 @@ fi
 
 HOMEBREW_LIBRARY="$HOMEBREW_REPOSITORY/Library"
 
-for VAR in EDITOR PATH BINTRAY_USER BINTRAY_KEY
+# Whitelist and copy to HOMEBREW_* all variables previously mentioned in
+# manpage or used elsewhere by Homebrew.
+for VAR in AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY BINTRAY_USER BINTRAY_KEY \
+           BROWSER EDITOR GIT PATH VISUAL
 do
   VAR_NEW="HOMEBREW_${VAR}"
   [[ -n "${!VAR_NEW}" ]] && continue