Skip to content
This repository has been archived by the owner on May 2, 2024. It is now read-only.

Commit

Permalink
Merge pull request #428 from rolandwalker/mass_change_uninstall_delete
Browse files Browse the repository at this point in the history
Mass Cask change to use `uninstall :delete`
  • Loading branch information
rolandwalker committed Sep 18, 2014
2 parents aa7d456 + 63c979a commit 539a8a2
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Casks/java7.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class Java7 < Cask
'/bin/ln', '-nsf', '--', "/Library/Java/JavaVirtualMachines/jdk#{version}.jdk/Contents/Home/jre/lib/server/libjvm.dylib", "/Library/Java/JavaVirtualMachines/jdk#{version}.jdk/Contents/Home/bundle/Libraries/libserver.dylib"
end
uninstall :pkgutil => 'com.oracle.jdk7u67',
:files => '/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK'
:delete => '/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK'
caveats <<-EOS.undent
This Cask makes minor modifications to the JRE to prevent any packaged
application issues.
Expand Down
4 changes: 1 addition & 3 deletions Casks/netbeans-php-nightly.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,5 @@ class NetbeansPhpNightly < Cask
url "http://bits.netbeans.org/download/trunk/nightly/latest/bundles/netbeans-trunk-nightly-#{version}-php-macosx.dmg"
pkg "NetBeans Dev #{version}.mpkg"

uninstall :files => [
'/Applications/NetBeans'
]
uninstall :delete => '/Applications/NetBeans'
end
2 changes: 1 addition & 1 deletion Casks/quicktime-player7.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ class QuicktimePlayer7 < Cask

pkg 'QuickTimePlayer7.6.6_SnowLeopard.pkg'
uninstall :pkgutil => 'com.apple.pkg.QuickTimePlayer7.6.6_SnowLeopard',
:files => '/Applications/Utilities/QuickTime Player 7.app'
:delete => '/Applications/Utilities/QuickTime Player 7.app'
end
2 changes: 1 addition & 1 deletion Casks/soundflower-ultraschall.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ class SoundflowerUltraschall < Cask

pkg 'Soundflower.pkg', :allow_untrusted => true
uninstall :pkgutil => 'com.cycling74.soundflower*',
:files => '/Applications/Soundflower'
:delete => '/Applications/Soundflower'
end

0 comments on commit 539a8a2

Please sign in to comment.