diff options
| author | Mike McQuaid | 2017-11-29 11:39:04 +0000 |
|---|---|---|
| committer | GitHub | 2017-11-29 11:39:04 +0000 |
| commit | 4bd184b706cebc24220dcbc7905b909e0e10a8f6 (patch) | |
| tree | 2d6c5541bb435ca3f0135319e83d38ade2354938 | |
| parent | 230a333950609a66aa109eaf62b6e4a63bbb7c18 (diff) | |
| parent | 2b7788d134e1d7eac02b73e681889cc147b0f20d (diff) | |
| download | brew-4bd184b706cebc24220dcbc7905b909e0e10a8f6.tar.bz2 | |
Merge branch 'master' into master
| -rw-r--r-- | Library/Homebrew/diagnostic.rb | 1 | ||||
| -rwxr-xr-x | bin/brew | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Library/Homebrew/diagnostic.rb b/Library/Homebrew/diagnostic.rb index e1b1bb8ee..61f9b53a3 100644 --- a/Library/Homebrew/diagnostic.rb +++ b/Library/Homebrew/diagnostic.rb @@ -180,6 +180,7 @@ module Homebrew "libecomlodr.dylib", # Symantec Endpoint Protection "libsymsea*.dylib", # Symantec Endpoint Protection "sentinel.dylib", # SentinelOne + "sentinel-*.dylib", # SentinelOne ] __check_stray_files "/usr/local/lib", "*.dylib", white_list, <<~EOS @@ -88,8 +88,8 @@ then PATH="/usr/bin:/bin:/usr/sbin:/sbin" FILTERED_ENV=() - for VAR in HOME SHELL PATH TERM LOGNAME USER CI TRAVIS \ - http_proxy https_proxy ftp_proxy no_proxy \ + for VAR in HOME SHELL PATH TERM LOGNAME USER CI TRAVIS SUDO_ASKPASS + http_proxy HTTPS_PROXY FTP_PROXY \ "${!HOMEBREW_@}" "${!TRAVIS_@}" "${!JENKINS_@}" do # Skip if variable value is empty. |
