diff options
| author | Mike McQuaid | 2017-09-23 10:58:26 +0100 |
|---|---|---|
| committer | GitHub | 2017-09-23 10:58:26 +0100 |
| commit | 3343467475c61d72e6796f35ed0eda5daa8a5513 (patch) | |
| tree | 64e1b2ed99101db2351831a2f8c9b53bd9be1ccc | |
| parent | d7fbcc6211e1e71758ec258d5b40aee9bc636ccd (diff) | |
| parent | aa665b94587ee7b0d69e783a669269a9954e8428 (diff) | |
| download | brew-3343467475c61d72e6796f35ed0eda5daa8a5513.tar.bz2 | |
Merge pull request #3189 from MikeMcQuaid/portable-ruby-messaging
portable-ruby: improve installation messaging.
| -rw-r--r-- | Library/Homebrew/cmd/vendor-install.sh | 2 | ||||
| -rw-r--r-- | Library/Homebrew/utils/ruby.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Library/Homebrew/cmd/vendor-install.sh b/Library/Homebrew/cmd/vendor-install.sh index 5cad7541e..4ffa17659 100644 --- a/Library/Homebrew/cmd/vendor-install.sh +++ b/Library/Homebrew/cmd/vendor-install.sh @@ -135,7 +135,7 @@ install() { fi safe_cd "$VENDOR_DIR" - [[ -n "$HOMEBREW_QUIET" ]] || echo "==> Unpacking $(basename "$VENDOR_URL")" + [[ -n "$HOMEBREW_QUIET" ]] || echo "==> Pouring $(basename "$VENDOR_URL")" tar "$tar_args" "$CACHED_LOCATION" safe_cd "$VENDOR_DIR/portable-$VENDOR_NAME" diff --git a/Library/Homebrew/utils/ruby.sh b/Library/Homebrew/utils/ruby.sh index 0303da600..813bb0999 100644 --- a/Library/Homebrew/utils/ruby.sh +++ b/Library/Homebrew/utils/ruby.sh @@ -22,7 +22,7 @@ setup-ruby-path() { if [[ $(readlink "$vendor_ruby_current_version") != "$(<"$vendor_dir/portable-ruby-version")" ]] then - if ! brew vendor-install ruby --quiet + if ! brew vendor-install ruby then onoe "Failed to upgrade vendor Ruby." fi @@ -42,7 +42,7 @@ setup-ruby-path() { if [[ "$ruby_old_version" == "true" || -n "$HOMEBREW_FORCE_VENDOR_RUBY" ]] then - brew vendor-install ruby --quiet + brew vendor-install ruby if [[ ! -x "$vendor_ruby_path" ]] then odie "Failed to install vendor Ruby." |