admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #3447 from sjackman/vendor-install-stderr

Browse Source 
vendor-install: Observe HOMEBREW_STDERR
This commit is contained in:
Mike McQuaid 2017-11-17 18:25:41 +00:00 committed by GitHub
commit 63c0378f65
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Library/Homebrew/cmd/vendor-install.sh
View File

@ -25,6 +25,15 @@ then
ruby_SHA="33643b1ca6f860d6df01686636326785763e5e81cf0cef37d8a7ab96a6ca1fa1" ruby_SHA="33643b1ca6f860d6df01686636326785763e5e81cf0cef37d8a7ab96a6ca1fa1"
fi 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() { fetch() {
local -a curl_args local -a curl_args
local sha local sha
@ -144,7 +153,7 @@ install() {
tar "$tar_args" "$CACHED_LOCATION" tar "$tar_args" "$CACHED_LOCATION"
safe_cd "$VENDOR_DIR/portable-$VENDOR_NAME" 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 then
ln -sfn "$VENDOR_VERSION" current ln -sfn "$VENDOR_VERSION" current
# remove old vendor installations by sorting files with modified time. # remove old vendor installations by sorting files with modified time.