Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update path to system settings on Ventura #14997

Merged
merged 2 commits into from
Mar 17, 2023
Merged

Update path to system settings on Ventura #14997

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9ce4a5
Update path to system settings on Ventura
ZhongRuoyu Mar 17, 2023
a0ba487
Fix `brew tests` since CI is running on Monterey
ZhongRuoyu Mar 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 14 additions & 2 deletions Library/Homebrew/cask/artifact/abstract_uninstall.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,9 +160,15 @@ def find_launchctl_with_wildcard(search)

sig { returns(String) }
def automation_access_instructions
navigation_path = if MacOS.version >= :ventura
"System Settings → Privacy & Security"
else
"System Preferences → Security & Privacy → Privacy"
end

<<~EOS
Enable Automation access for "Terminal → System Events" in:
System Preferences → Security & Privacy → Privacy → Automation
#{navigation_path} → Automation
if you haven't already.
EOS
end
Expand Down Expand Up @@ -371,8 +377,14 @@ def each_resolved_path(action, paths)
rescue Errno::EPERM
raise if File.readable?(File.expand_path("~/Library/Application Support/com.apple.TCC"))

navigation_path = if MacOS.version >= :ventura
"System Settings → Privacy & Security"
else
"System Preferences → Security & Privacy → Privacy"
end

odie "Unable to remove some files. Please enable Full Disk Access for your terminal under " \
"System Preferences → Security & Privacy → Privacy → Full Disk Access."
"#{navigation_path} → Full Disk Access."
end
end
end
Expand Down
14 changes: 10 additions & 4 deletions Library/Homebrew/cask/dsl/caveats.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,16 @@ def eval_caveats(&block)
caveat :kext do
next if MacOS.version < :high_sierra

navigation_path = if MacOS.version >= :ventura
"System Settings → Privacy & Security"
else
"System Preferences → Security & Privacy → General"
end

<<~EOS
#{@cask} requires a kernel extension to work.
If the installation fails, retry after you enable it in:
System Preferences → Security & Privacy → General
#{navigation_path}

For more information, refer to vendor documentation or this Apple Technical Note:
#{Formatter.url("https://developer.apple.com/library/content/technotes/tn2459/_index.html")}
Expand All @@ -71,10 +77,10 @@ def eval_caveats(&block)
caveat :unsigned_accessibility do |access = "Accessibility"|
# access: the category in the privacy settings the app requires.

navigation_path = if MacOS.version < :ventura
"System Preferences → Security & Privacy → Privacy"
else
navigation_path = if MacOS.version >= :ventura
"System Settings → Privacy & Security"
else
"System Preferences → Security & Privacy → Privacy"
end

<<~EOS
Expand Down
4 changes: 3 additions & 1 deletion Library/Homebrew/os/mac/xcode.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,9 @@ def installation_instructions

sig { returns(String) }
def update_instructions
software_update_location = if MacOS.version >= "10.14"
software_update_location = if MacOS.version >= "13"
"System Settings"
elsif MacOS.version >= "10.14"
"System Preferences"
else
"the App Store"
Expand Down
4 changes: 2 additions & 2 deletions docs/Cask-Cookbook.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,8 +386,8 @@ The following methods may be called to generate standard warning messages:
| `reboot` | Users should reboot to complete installation.
| `files_in_usr_local` | The cask installs files to `/usr/local`, which may confuse Homebrew.
| `discontinued` | All software development has been officially discontinued upstream.
| `kext` | Users may need to enable their kexts in *System Preferences → Security & Privacy → General*.
| `unsigned_accessibility` | Users will need to re-enable the app on each update in *System Preferences → Security & Privacy → Privacy* as it is unsigned.
| `kext` | Users may need to enable their kexts in *System Settings → Privacy & Security* (or *System Preferences → Security & Privacy → General* in earlier macOS versions).
| `unsigned_accessibility` | Users will need to re-enable the app on each update in *System Settings → Privacy & Security* (or *System Preferences → Security & Privacy → Privacy* in earlier macOS versions) as it is unsigned.
| `license "web_page"` | Users may find the software's usage license at `web_page`.
| `free_license "web_page"` | Users may obtain an official license to use the software at `web_page`.

Expand Down