dnrops
/
homebrew-cask
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4382 from rolandwalker/no_doubledash_launchctl_remove 

don't use doubledash on launchctl remove
This commit is contained in:
Roland Walker 2014-05-14 06:26:27 -04:00
parent 67c3759a64 6815ef272e
commit d4c89509c2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/cask/artifact/pkg.rb
View File

@ -106,7 +106,7 @@ class Cask::Artifact::Pkg < Cask::Artifact::Base
if %r{^<\?xml}.match(xml_status)
@command.run('/bin/launchctl', :args => ['unload', '-w', '--', service], :sudo => with_sudo)
sleep 1
@command.run!('/bin/launchctl', :args => ['remove', '--', service], :sudo => with_sudo)
@command.run!('/bin/launchctl', :args => ['remove', service], :sudo => with_sudo)
sleep 1
end
end

2
test/cask/artifact/pkg_test.rb
View File

@ -107,7 +107,7 @@ describe Cask::Artifact::Pkg do
PLIST
)
Cask::FakeSystemCommand.expects_command(['/usr/bin/sudo', '-E', '--', '/bin/launchctl', 'remove', '--', 'my.fancy.package.service'])
Cask::FakeSystemCommand.expects_command(['/usr/bin/sudo', '-E', '--', '/bin/launchctl', 'remove', 'my.fancy.package.service'])
Cask::FakeSystemCommand.expects_command(['/usr/bin/sudo', '-E', '--', '/bin/launchctl', 'unload', '-w', '--', 'my.fancy.package.service'])
Cask::FakeSystemCommand.stubs_command(['/usr/bin/sudo', '-E', '--', '/usr/sbin/kextstat', '-l', '-b', 'my.fancy.package.kernelextension'], 'loaded')