Merge pull request #4382 from rolandwalker/no_doubledash_launchctl_remove
don't use doubledash on launchctl remove
This commit is contained in:
commit
d4c89509c2
|
@ -106,7 +106,7 @@ class Cask::Artifact::Pkg < Cask::Artifact::Base
|
||||||
if %r{^<\?xml}.match(xml_status)
|
if %r{^<\?xml}.match(xml_status)
|
||||||
@command.run('/bin/launchctl', :args => ['unload', '-w', '--', service], :sudo => with_sudo)
|
@command.run('/bin/launchctl', :args => ['unload', '-w', '--', service], :sudo => with_sudo)
|
||||||
sleep 1
|
sleep 1
|
||||||
@command.run!('/bin/launchctl', :args => ['remove', '--', service], :sudo => with_sudo)
|
@command.run!('/bin/launchctl', :args => ['remove', service], :sudo => with_sudo)
|
||||||
sleep 1
|
sleep 1
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -107,7 +107,7 @@ describe Cask::Artifact::Pkg do
|
||||||
PLIST
|
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.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')
|
Cask::FakeSystemCommand.stubs_command(['/usr/bin/sudo', '-E', '--', '/usr/sbin/kextstat', '-l', '-b', 'my.fancy.package.kernelextension'], 'loaded')
|
||||||
|
|
Loading…
Reference in New Issue