Merge branch 'master' into audit_line_rubocop_part_4_rebase_attempt_1

3 files changed, 7 insertions, 7 deletions

diff --git a/Library/Homebrew/utils/github.rb b/Library/Homebrew/utils/github.rb
index df0811e95..f88d52403 100644
--- a/Library/Homebrew/utils/github.rb
+++ b/Library/Homebrew/utils/github.rb
@@ -16,7 +16,7 @@ module GitHub
 
   class RateLimitExceededError < Error
     def initialize(reset, error)
-      super <<-EOS.undent
+      super <<~EOS
         GitHub API Error: #{error}
         Try again in #{pretty_ratelimit_reset(reset)}, or create a personal access token:
           #{ALL_SCOPES_URL}
@@ -33,12 +33,12 @@ module GitHub
     def initialize(error)
       message = "GitHub #{error}\n"
       if ENV["HOMEBREW_GITHUB_API_TOKEN"]
-        message << <<-EOS.undent
+        message << <<~EOS
           HOMEBREW_GITHUB_API_TOKEN may be invalid or expired; check:
           #{Formatter.url("https://github.com/settings/tokens")}
         EOS
       else
-        message << <<-EOS.undent
+        message << <<~EOS
           The GitHub credentials in the macOS keychain may be invalid.
           Clear them with:
             printf "protocol=https\\nhost=github.com\\n" | git credential-osxkeychain erase
@@ -104,7 +104,7 @@ module GitHub
 
         case GitHub.api_credentials_type
         when :keychain
-          onoe <<-EOS.undent
+          onoe <<~EOS
             Your macOS keychain GitHub credentials do not have sufficient scope!
             Scopes they need: #{needed_human_scopes}
             Scopes they have: #{credentials_scopes}
@@ -112,7 +112,7 @@ module GitHub
             and then set HOMEBREW_GITHUB_API_TOKEN as the authentication method instead.
           EOS
         when :environment
-          onoe <<-EOS.undent
+          onoe <<~EOS
             Your HOMEBREW_GITHUB_API_TOKEN does not have sufficient scope!
             Scopes they need: #{needed_human_scopes}
             Scopes it has: #{credentials_scopes}
diff --git a/Library/Homebrew/utils/link.rb b/Library/Homebrew/utils/link.rb
index 095dba209..96bfd602e 100644
--- a/Library/Homebrew/utils/link.rb
+++ b/Library/Homebrew/utils/link.rb
@@ -22,7 +22,7 @@ module Utils
       end
 
       return if conflicts.empty?
-      onoe <<-EOS.undent
+      onoe <<~EOS
         Could not link:
         #{conflicts.join("\n")}
 
diff --git a/Library/Homebrew/utils/ruby.sh b/Library/Homebrew/utils/ruby.sh
index 9a3ab2e81..b16531e9f 100644
--- a/Library/Homebrew/utils/ruby.sh
+++ b/Library/Homebrew/utils/ruby.sh
@@ -40,7 +40,7 @@ setup-ruby-path() {
         ruby_old_version="$("$HOMEBREW_RUBY_PATH" -rrubygems -e "puts Gem::Version.new('$minimum_ruby_version') > Gem::Version.new(RUBY_VERSION)")"
       fi
 
-      if [[ "$ruby_old_version" == "true" || -n "$HOMEBREW_FORCE_VENDOR_RUBY" ]]
+      if [[ -z "$HOMEBREW_RUBY_PATH" || "$ruby_old_version" == "true" || -n "$HOMEBREW_FORCE_VENDOR_RUBY" ]]
       then
         brew vendor-install ruby
         if [[ ! -x "$vendor_ruby_path" ]]