aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/utils
diff options
context:
space:
mode:
Diffstat (limited to 'Library/Homebrew/utils')
-rw-r--r--Library/Homebrew/utils/analytics.sh2
-rw-r--r--Library/Homebrew/utils/github.rb4
-rw-r--r--Library/Homebrew/utils/ruby.sh2
3 files changed, 4 insertions, 4 deletions
diff --git a/Library/Homebrew/utils/analytics.sh b/Library/Homebrew/utils/analytics.sh
index b37cd3e8e..0bc58c0be 100644
--- a/Library/Homebrew/utils/analytics.sh
+++ b/Library/Homebrew/utils/analytics.sh
@@ -38,7 +38,7 @@ setup-analytics() {
if [[ -n "$HOMEBREW_LINUX" ]]
then
HOMEBREW_ANALYTICS_USER_UUID="$(tr a-f A-F </proc/sys/kernel/random/uuid)"
- elif [[ -n "$HOMEBREW_OSX" ]]
+ elif [[ -n "$HOMEBREW_MACOS" ]]
then
HOMEBREW_ANALYTICS_USER_UUID="$(/usr/bin/uuidgen)"
else
diff --git a/Library/Homebrew/utils/github.rb b/Library/Homebrew/utils/github.rb
index 9431fa15f..654272363 100644
--- a/Library/Homebrew/utils/github.rb
+++ b/Library/Homebrew/utils/github.rb
@@ -33,7 +33,7 @@ module GitHub
EOS
else
message << <<-EOS.undent
- The GitHub credentials in the OS X keychain may be invalid.
+ The GitHub credentials in the macOS keychain may be invalid.
Clear them with:
printf "protocol=https\\nhost=github.com\\n" | git credential-osxkeychain erase
Or create a personal access token:
@@ -103,7 +103,7 @@ module GitHub
case GitHub.api_credentials_type
when :keychain
onoe <<-EOS.undent
- Your OS X keychain GitHub credentials do not have sufficient scope!
+ Your macOS keychain GitHub credentials do not have sufficient scope!
Scopes they have: #{credentials_scopes}
Create a personal access token: https://github.com/settings/tokens
and then set HOMEBREW_GITHUB_API_TOKEN as the authentication method instead.
diff --git a/Library/Homebrew/utils/ruby.sh b/Library/Homebrew/utils/ruby.sh
index 81bc16835..6945c068b 100644
--- a/Library/Homebrew/utils/ruby.sh
+++ b/Library/Homebrew/utils/ruby.sh
@@ -27,7 +27,7 @@ setup-ruby-path() {
fi
fi
else
- if [[ -n "$HOMEBREW_OSX" ]]
+ if [[ -n "$HOMEBREW_MACOS" ]]
then
HOMEBREW_RUBY_PATH="/System/Library/Frameworks/Ruby.framework/Versions/Current/usr/bin/ruby"
else