diff options
| author | Mike McQuaid | 2017-11-17 18:25:41 +0000 |
|---|---|---|
| committer | GitHub | 2017-11-17 18:25:41 +0000 |
| commit | 63c0378f654905e215b4de60b123e951628a2071 (patch) | |
| tree | f5de84dd7967414c7449bf30433dee0f7cfa5a5e /Library | |
| parent | ac33c05344b5436edff5d94abc816cc615c23a66 (diff) | |
| parent | 6da95d882de5f1e1a5e12199b02b1f01f2d427e8 (diff) | |
| download | brew-63c0378f654905e215b4de60b123e951628a2071.tar.bz2 | |
Merge pull request #3447 from sjackman/vendor-install-stderr
vendor-install: Observe HOMEBREW_STDERR
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/cmd/vendor-install.sh | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/Library/Homebrew/cmd/vendor-install.sh b/Library/Homebrew/cmd/vendor-install.sh index 15caca8ef..fa9cb20d3 100644 --- a/Library/Homebrew/cmd/vendor-install.sh +++ b/Library/Homebrew/cmd/vendor-install.sh @@ -25,6 +25,15 @@ then ruby_SHA="33643b1ca6f860d6df01686636326785763e5e81cf0cef37d8a7ab96a6ca1fa1" fi +# Execute the specified command, and suppress stderr unless HOMEBREW_STDERR is set. +quiet_stderr() { + if [[ -z "$HOMEBREW_STDERR" ]]; then + command "$@" 2>/dev/null + else + command "$@" + fi +} + fetch() { local -a curl_args local sha @@ -144,7 +153,7 @@ install() { tar "$tar_args" "$CACHED_LOCATION" safe_cd "$VENDOR_DIR/portable-$VENDOR_NAME" - if "./$VENDOR_VERSION/bin/$VENDOR_NAME" --version >/dev/null 2>&1 + if quiet_stderr "./$VENDOR_VERSION/bin/$VENDOR_NAME" --version >/dev/null then ln -sfn "$VENDOR_VERSION" current # remove old vendor installations by sorting files with modified time. |