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

cask: Don’t remove login items on upgrade. #5181

Merged
merged 1 commit into from
Oct 26, 2018
Merged

cask: Don’t remove login items on upgrade. #5181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion Library/Homebrew/cask/artifact/abstract_uninstall.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,9 @@ def uninstall_signal(*signals, command: nil, **_)
end
end

def uninstall_login_item(*login_items, command: nil, **_)
def uninstall_login_item(*login_items, command: nil, upgrade: false, **_)
return if upgrade

login_items.each do |name|
ohai "Removing login item #{name}"
command.run!(
Expand Down
2 changes: 1 addition & 1 deletion Library/Homebrew/cask/installer.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ def uninstall_artifacts(clear: false)
next unless artifact.respond_to?(:uninstall_phase)

odebug "Un-installing artifact of class #{artifact.class}"
artifact.uninstall_phase(command: @command, verbose: verbose?, skip: clear, force: force?)
artifact.uninstall_phase(command: @command, verbose: verbose?, skip: clear, force: force?, upgrade: upgrade?)
end
end

Expand Down