Merge pull request #4630 from lembacon/obsolete-github-env
Remove environment variables used by `hub`.
This commit is contained in:
commit
3bce1c78bc
@ -78,14 +78,6 @@ module Homebrew
|
|||||||
# Use the user's browser, too.
|
# Use the user's browser, too.
|
||||||
ENV["BROWSER"] = ENV["HOMEBREW_BROWSER"]
|
ENV["BROWSER"] = ENV["HOMEBREW_BROWSER"]
|
||||||
|
|
||||||
# Setup GitHub environment variables
|
|
||||||
%w[GITHUB_USER GITHUB_PASSWORD GITHUB_TOKEN].each do |env|
|
|
||||||
homebrew_env = ENV["HOMEBREW_#{env}"]
|
|
||||||
next unless homebrew_env
|
|
||||||
next if homebrew_env.empty?
|
|
||||||
ENV[env] = homebrew_env
|
|
||||||
end
|
|
||||||
|
|
||||||
formula = ARGV.formulae.first
|
formula = ARGV.formulae.first
|
||||||
|
|
||||||
if formula
|
if formula
|
||||||
|
|||||||
3
bin/brew
3
bin/brew
@ -53,8 +53,7 @@ HOMEBREW_LIBRARY="$HOMEBREW_REPOSITORY/Library"
|
|||||||
# Whitelist and copy to HOMEBREW_* all variables previously mentioned in
|
# Whitelist and copy to HOMEBREW_* all variables previously mentioned in
|
||||||
# manpage or used elsewhere by Homebrew.
|
# manpage or used elsewhere by Homebrew.
|
||||||
for VAR in AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY BINTRAY_USER BINTRAY_KEY \
|
for VAR in AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY BINTRAY_USER BINTRAY_KEY \
|
||||||
BROWSER EDITOR GIT NO_COLOR PATH VISUAL \
|
BROWSER EDITOR GIT NO_COLOR PATH VISUAL
|
||||||
GITHUB_USER GITHUB_PASSWORD GITHUB_TOKEN
|
|
||||||
do
|
do
|
||||||
# Skip if variable value is empty.
|
# Skip if variable value is empty.
|
||||||
[[ -z "${!VAR}" ]] && continue
|
[[ -z "${!VAR}" ]] && continue
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user