Skip to content

Commit b1908e5

Browse files
committed
WIP: Adding placeholder for using osascript to register/unregister login items
1 parent c6f48ea commit b1908e5

File tree

5 files changed

+22
-9
lines changed

5 files changed

+22
-9
lines changed

Library/Homebrew/cask/installer.rb

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -317,13 +317,14 @@ def install_artifacts(predecessor: nil)
317317
already_installed_artifacts.unshift(artifact)
318318
end
319319

320-
# TODO: should we register the login_items here?
321-
# if login_items?
322-
# login_items.each do |lgi|
323-
# # TODO: register the login_items here using osascript
324-
# puts "***** WILL REGISTER login_item: #{lgi}"
325-
# end
326-
# end
320+
if login_items?
321+
@cask.login_items.each do |lgi|
322+
# TODO: register the login_items here using osascript
323+
ohai "***** Will REGISTER login_item: #{lgi}"
324+
end
325+
else
326+
ohai "Skipping processing of login_items"
327+
end
327328

328329
save_config_file
329330
save_download_sha if @cask.version.latest?
@@ -561,6 +562,15 @@ def uninstall_artifacts(clear: false, successor: nil)
561562
odebug "Uninstalling artifacts"
562563
odebug "#{::Utils.pluralize("artifact", artifacts.length, include_count: true)} defined", artifacts
563564

565+
if login_items?
566+
@cask.login_items.each do |lgi|
567+
# TODO: unregister the login_items here using osascript
568+
ohai "***** Will UNREGISTER login_item: #{lgi}"
569+
end
570+
else
571+
ohai "Skipping processing of login_items"
572+
end
573+
564574
artifacts.each do |artifact|
565575
if artifact.respond_to?(:uninstall_phase)
566576
odebug "Uninstalling artifact of class #{artifact.class}"

Library/Homebrew/cask/reinstall.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ def self.reinstall_casks(
1818
require_sha: false,
1919
quarantine: false,
2020
zap: false,
21-
login_items: false
21+
login_items: true
2222
)
2323
require "cask/installer"
2424

Library/Homebrew/cmd/uninstall.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ def run
6767

6868
raise Cask::CaskNotInstalledError, cask if !cask.installed? && !args.force?
6969

70-
Cask::Installer.new(cask, verbose: args.verbose?, force: args.force?).zap
70+
Cask::Installer.new(cask, verbose: args.verbose?, force: args.force?, login_items: true).zap
7171
end
7272
else
7373
Cask::Uninstall.uninstall_casks(

Library/Homebrew/test/cask/reinstall_spec.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
==> Downloading file:.*caffeine.zip
1414
Already downloaded: .*--caffeine.zip
1515
==> Uninstalling Cask local-caffeine
16+
==> Skipping processing of login_items
1617
==> Backing App 'Caffeine.app' up to '.*Caffeine.app'
1718
==> Removing App '.*Caffeine.app'
1819
==> Purging files for version 1.2.3 of Cask local-caffeine
@@ -35,6 +36,7 @@
3536
==> Downloading file:.*caffeine.zip
3637
Already downloaded: .*--caffeine.zip
3738
==> Implied `brew uninstall --cask local-caffeine`
39+
==> Skipping processing of login_items
3840
==> Backing App 'Caffeine.app' up to '.*Caffeine.app'
3941
==> Removing App '.*Caffeine.app'
4042
==> Dispatching zap stanza

Library/Homebrew/test/cask/uninstall_spec.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
output = Regexp.new <<~EOS
1212
==> Uninstalling Cask local-caffeine
13+
==> Skipping processing of login_items
1314
==> Backing App 'Caffeine.app' up to '.*Caffeine.app'
1415
==> Removing App '.*Caffeine.app'
1516
==> Purging files for version 1.2.3 of Cask local-caffeine

0 commit comments

Comments
 (0)