Merge pull request #3207 from MikeMcQuaid/vendor-install-stderr

vendor-install: output only to stderr.
This commit is contained in:
Mike McQuaid 2017-09-25 09:42:16 +01:00 committed by GitHub
commit 3cd2373e2f

View File

@ -48,17 +48,17 @@ fetch() {
temporary_path="$CACHED_LOCATION.incomplete" temporary_path="$CACHED_LOCATION.incomplete"
mkdir -p "$HOMEBREW_CACHE" mkdir -p "$HOMEBREW_CACHE"
[[ -n "$HOMEBREW_QUIET" ]] || echo "==> Downloading $VENDOR_URL" [[ -n "$HOMEBREW_QUIET" ]] || echo "==> Downloading $VENDOR_URL" >&2
if [[ -f "$CACHED_LOCATION" ]] if [[ -f "$CACHED_LOCATION" ]]
then then
[[ -n "$HOMEBREW_QUIET" ]] || echo "Already downloaded: $CACHED_LOCATION" [[ -n "$HOMEBREW_QUIET" ]] || echo "Already downloaded: $CACHED_LOCATION" >&2
else else
if [[ -f "$temporary_path" ]] if [[ -f "$temporary_path" ]]
then then
"$HOMEBREW_CURL" "${curl_args[@]}" -C - "$VENDOR_URL" -o "$temporary_path" "$HOMEBREW_CURL" "${curl_args[@]}" -C - "$VENDOR_URL" -o "$temporary_path"
if [[ $? -eq 33 ]] if [[ $? -eq 33 ]]
then then
[[ -n "$HOMEBREW_QUIET" ]] || echo "Trying a full download" [[ -n "$HOMEBREW_QUIET" ]] || echo "Trying a full download" >&2
rm -f "$temporary_path" rm -f "$temporary_path"
"$HOMEBREW_CURL" "${curl_args[@]}" "$VENDOR_URL" -o "$temporary_path" "$HOMEBREW_CURL" "${curl_args[@]}" "$VENDOR_URL" -o "$temporary_path"
fi fi
@ -135,7 +135,7 @@ install() {
fi fi
safe_cd "$VENDOR_DIR" safe_cd "$VENDOR_DIR"
[[ -n "$HOMEBREW_QUIET" ]] || echo "==> Pouring $(basename "$VENDOR_URL")" [[ -n "$HOMEBREW_QUIET" ]] || echo "==> Pouring $(basename "$VENDOR_URL")" >&2
tar "$tar_args" "$CACHED_LOCATION" tar "$tar_args" "$CACHED_LOCATION"
safe_cd "$VENDOR_DIR/portable-$VENDOR_NAME" safe_cd "$VENDOR_DIR/portable-$VENDOR_NAME"