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.

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

Change 37 Casks to use container :nested #6579

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
54c077c
container :nested in a-slower-speed-of-light
rolandwalker Oct 9, 2014
c04e506
container :nested in anonym
rolandwalker Oct 9, 2014
f04391e
container :nested in anxiety
rolandwalker Oct 9, 2014
3341aca
container :nested in au-lab
rolandwalker Oct 9, 2014
c59eb64
container :nested in avogadro
rolandwalker Oct 9, 2014
58524de
container :nested in ax88179
rolandwalker Oct 9, 2014
0dde26a
container :nested in ax88772
rolandwalker Oct 9, 2014
44f4ba8
container :nested in bassjump
rolandwalker Oct 9, 2014
85af7f2
container :nested in capsee
rolandwalker Oct 9, 2014
8a1993f
container :nested in decitime
rolandwalker Oct 9, 2014
8428454
container :nested in devonthink-pro-office
rolandwalker Oct 9, 2014
532fdcc
container :nested in devonthink-pro
rolandwalker Oct 9, 2014
c88d248
container :nested in djview
rolandwalker Oct 9, 2014
0cf9100
container :nested in duplicate-annihilator
rolandwalker Oct 9, 2014
8e7866a
container :nested in dupscanub
rolandwalker Oct 9, 2014
b8b82b4
container :nested in fenix
rolandwalker Oct 9, 2014
9c9919a
container :nested in git-annex
rolandwalker Oct 9, 2014
226963b
container :nested in hush
rolandwalker Oct 9, 2014
5293152
container :nested in icefloor
rolandwalker Oct 9, 2014
5eab379
container :nested in intel-haxm
rolandwalker Oct 9, 2014
9559893
container :nested in intel-power-gadget
rolandwalker Oct 9, 2014
eb4b4c9
container :nested in jetphoto-studio
rolandwalker Oct 9, 2014
c521368
container :nested in macmoney
rolandwalker Oct 9, 2014
cc6c11b
container :nested in mailfollowup
rolandwalker Oct 9, 2014
137eb6b
container :nested in mass-replace-it
rolandwalker Oct 9, 2014
543d90e
container :nested in mcs783x
rolandwalker Oct 9, 2014
43c7242
container :nested in menucalendarclock-ical
rolandwalker Oct 9, 2014
404d3fd
container :nested in menuola
rolandwalker Oct 9, 2014
b87f1c0
container :nested in raw-photo-processor
rolandwalker Oct 9, 2014
c8e69f5
container :nested in raw-therapee
rolandwalker Oct 9, 2014
4b7ed82
container :nested in refresh-finder
rolandwalker Oct 9, 2014
66799ad
container :nested in sharetool
rolandwalker Oct 9, 2014
d868826
container :nested in silo
rolandwalker Oct 9, 2014
a243053
container :nested in snes9x
rolandwalker Oct 9, 2014
208f73d
container :nested in thumbsup
rolandwalker Oct 9, 2014
5a8537e
container :nested in timemachinescheduler
rolandwalker Oct 9, 2014
9165122
container :nested in waterroof
rolandwalker Oct 9, 2014
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Casks/a-slower-speed-of-light.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ class ASlowerSpeedOfLight < Cask
homepage 'http://gamelab.mit.edu/games/a-slower-speed-of-light/'
license :unknown

nested_container 'A Slower Speed of Light.dmg'
container :nested => 'A Slower Speed of Light.dmg'
app 'A Slower Speed of Light.app'
end
2 changes: 1 addition & 1 deletion Casks/anonym.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ class Anonym < Cask
homepage 'http://www.hanynet.com/anonym/index.html'
license :oss

nested_container "Anonym #{version}.dmg"
container :nested => "Anonym #{version}.dmg"
app 'Anonym.app'
end
2 changes: 1 addition & 1 deletion Casks/anxiety.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ class Anxiety < Cask
homepage 'http://www.anxietyapp.com/'
license :unknown

nested_container 'Anxiety.dmg'
container :nested => 'Anxiety.dmg'
app 'Anxiety.app'
end
2 changes: 1 addition & 1 deletion Casks/au-lab.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ class AuLab < Cask
homepage 'http://www.apple.com/itunes/mastered-for-itunes/'
license :unknown

nested_container 'AU Lab Image.dmg'
container :nested => 'AU Lab Image.dmg'
app 'AU Lab.app'
end
2 changes: 1 addition & 1 deletion Casks/avogadro.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ class Avogadro < Cask
homepage 'http://avogadro.openmolecules.net/'
license :oss

nested_container "Avogadro-#{version}.dmg"
container :nested => "Avogadro-#{version}.dmg"
app 'Avogadro.app'
end
2 changes: 1 addition & 1 deletion Casks/ax88179.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ def self.basename
homepage 'http://www.asix.com.tw/products.php?op=pItemdetail&PItemID=131;71;112&PLine=71'
license :unknown

nested_container "#{Utils.basename}/AX88179_178A.dmg"
container :nested => "#{Utils.basename}/AX88179_178A.dmg"
pkg "AX88179_178A_v#{version[0..-10]}.pkg"
uninstall :script => { :executable => 'AX88179_178A_Uninstall_v140' }
end
2 changes: 1 addition & 1 deletion Casks/ax88772.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ def self.basename
homepage 'http://www.asix.com.tw/products.php?op=pItemdetail&PItemID=86;71;101&PLine=71'
license :unknown

nested_container "#{Utils.basename}/AX88772.dmg"
container :nested => "#{Utils.basename}/AX88772.dmg"
pkg "AX88772_v#{version[0..-10]}.pkg"
uninstall :script => { :executable => 'AX88772C_772B_772A_760_772_Uninstall_v130' }
end
2 changes: 1 addition & 1 deletion Casks/bassjump.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class Bassjump < Cask

url "http://ffe82a399885f9f28605-66638985576304cbe11c530b9b932f18.r24.cf2.rackcdn.com/BassJumpInstaller_#{version}.dmg.zip"

nested_container "BassJumpInstaller_#{version}.dmg"
container :nested => "BassJumpInstaller_#{version}.dmg"
pkg 'BassJumpInstaller.pkg'
end

Expand Down
2 changes: 1 addition & 1 deletion Casks/capsee.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ class Capsee < Cask
homepage 'http://www.threemagination.com/capsee/'
license :unknown

nested_container 'CapSee12.dmg'
container :nested => 'CapSee12.dmg'
app 'CapSee.app'
end
3 changes: 2 additions & 1 deletion Casks/decitime.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,13 @@ class Decitime < Cask
homepage 'http://www.tinbert.com/DeciTimeMac/'
license :oss

nested_container 'DeciTime101.dmg'
container :nested => 'DeciTime101.dmg'
app 'DeciTime.app'

# fix wonky DMG by mounting it once read-write per discussion at
# https://github.com/caskroom/homebrew-cask/pull/2654
preflight do
# todo the nested_container hack must be revised when container :nested stops being an alias around 0.50.0
system %Q{/usr/bin/hdiutil eject "$(/usr/bin/hdiutil mount -readwrite -noidme -nobrowse -mountrandom /tmp #{destination_path.join(artifacts[:nested_container].first)} | /usr/bin/cut -f3 -- - | /usr/bin/grep -- '.' -)" >/dev/null 2>&1}
end
end
2 changes: 1 addition & 1 deletion Casks/devonthink-pro-office.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class DevonthinkProOffice < Cask
homepage 'http://www.devontechnologies.com/products/devonthink/devonthink-pro-office.html'
license :unknown

nested_container 'DEVONthink_Pro_Office.dmg'
container :nested => 'DEVONthink_Pro_Office.dmg'
# Renamed for consistency: app name is different in the Finder and in a shell.
# Original discussion: https://github.com/caskroom/homebrew-cask/pull/3838
app 'DEVONthink Pro.app', :target => 'DEVONthink Pro Office.app'
Expand Down
2 changes: 1 addition & 1 deletion Casks/devonthink-pro.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ class DevonthinkPro < Cask
homepage 'http://www.devontechnologies.com/products/devonthink/devonthink-pro.html'
license :unknown

nested_container 'DEVONthink_Pro.dmg'
container :nested => 'DEVONthink_Pro.dmg'
app 'DEVONthink Pro.app'
end
2 changes: 1 addition & 1 deletion Casks/djview.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ class Djview < Cask
homepage 'http://djvu.sourceforge.net/'
license :oss

nested_container "djvulibre-3.5.22+djview-#{version}-intel.dmg"
container :nested => "djvulibre-3.5.22+djview-#{version}-intel.dmg"
app 'DjView.app'
end
2 changes: 1 addition & 1 deletion Casks/duplicate-annihilator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ class DuplicateAnnihilator < Cask
homepage 'http://brattoo.com/propaganda/'
license :unknown

nested_container 'Duplicate Annihilator.dmg'
container :nested => 'Duplicate Annihilator.dmg'
app 'Duplicate Annihilator.app'
end
2 changes: 1 addition & 1 deletion Casks/dupscanub.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ class Dupscanub < Cask
homepage 'http://www5.wind.ne.jp/miko/mac_soft/dup_scan/index.html'
license :unknown

nested_container 'DupScanUB_241.dmg'
container :nested => 'DupScanUB_241.dmg'
app 'DupScan(UB).app'
end
2 changes: 1 addition & 1 deletion Casks/fenix.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ class Fenix < Cask
url "https://github.com/coreybutler/fenix/releases/download/v#{version}/fenix-osx-#{version}.zip"
homepage 'http://fenixwebserver.com/'
license :oss
nested_container "Fenix_#{version}.dmg"
container :nested => "Fenix_#{version}.dmg"

app 'Fenix.app'
end
2 changes: 1 addition & 1 deletion Casks/git-annex.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class GitAnnex < Cask
preflight do
system '/bin/mv', '--', destination_path.join('git-annex-latest'), destination_path.join('git-annex-latest.dmg')
end
nested_container 'git-annex-latest.dmg'
container :nested => 'git-annex-latest.dmg'
else
url 'http://downloads.kitenet.net/git-annex/OSX/current/10.9_Mavericks/git-annex.dmg'
end
Expand Down
2 changes: 1 addition & 1 deletion Casks/hush.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ class Hush < Cask
homepage 'http://coffitivity.com/hush/'
license :unknown

nested_container 'Hush.dmg'
container :nested => 'Hush.dmg'
app 'Hush.app'
end
2 changes: 1 addition & 1 deletion Casks/icefloor.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ class Icefloor < Cask
homepage 'http://www.hanynet.com/icefloor/'
license :oss

nested_container "IceFloor #{version}.dmg"
container :nested => "IceFloor #{version}.dmg"
app 'IceFloor.app'
end
2 changes: 1 addition & 1 deletion Casks/intel-haxm.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ class IntelHaxm < Cask
homepage 'https://software.intel.com/en-us/android/articles/intel-hardware-accelerated-execution-manager'
license :unknown

nested_container "haxm-macosx_r04/IntelHAXM_#{version}.dmg"
container :nested => "haxm-macosx_r04/IntelHAXM_#{version}.dmg"
pkg "IntelHAXM_#{version}.mpkg"
uninstall :script => { :executable => '/System/Library/Extensions/intelhaxm.kext/Contents/Resources/uninstall.sh', :input => 'y' }
end
2 changes: 1 addition & 1 deletion Casks/intel-power-gadget.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class IntelPowerGadget < Cask
license :unknown

# this bogus-looking character accurately reflects an upstream error
nested_container 'IntelÆ Power Gadget.dmg'
container :nested => 'IntelÆ Power Gadget.dmg'
pkg 'Install Intel Power Gadget.pkg'
uninstall :pkgutil => 'com.intel.pkg.PowerGadget.*'
end
2 changes: 1 addition & 1 deletion Casks/jetphoto-studio.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ class JetphotoStudio < Cask
homepage 'http://www.jetphotosoft.com/web/home/'
license :unknown

nested_container "JetPhoto Studio #{version}.dmg"
container :nested => "JetPhoto Studio #{version}.dmg"
app 'JetPhoto Studio.app'
end
2 changes: 1 addition & 1 deletion Casks/macmoney.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ class Macmoney < Cask
homepage 'http://www.devon.riceball.net/display.php?file=m01'
license :unknown

nested_container "MacMoney_#{version}.dmg"
container :nested => "MacMoney_#{version}.dmg"
app 'MacMoney.app'
end
2 changes: 1 addition & 1 deletion Casks/mailfollowup.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ class Mailfollowup < Cask
homepage 'http://www.cs.unc.edu/~welch/MailFollowup/'
license :unknown

nested_container "MailFollowUp_#{version}.dmg"
container :nested => "MailFollowUp_#{version}.dmg"
pkg 'Install MailFollowUp.pkg'

uninstall :quit => 'com.apple.mail',
Expand Down
2 changes: 1 addition & 1 deletion Casks/mass-replace-it.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
class MassReplaceIt < Cask
version '2.9.1'
sha256 '1ab3482f7568953899474397fa401342daec56d4efe4a856de8e387294f7c667'
nested_container 'MassReplaceIt.dmg'
container :nested => 'MassReplaceIt.dmg'

url 'http://www.hexmonkeysoftware.com/files/mri.dmg.zip'
homepage 'http://www.hexmonkeysoftware.com/'
Expand Down
2 changes: 1 addition & 1 deletion Casks/mcs783x.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ def self.basename
homepage 'http://www.asix.com.tw/products.php?op=ProductList&PLine=74&PSeries=109'
license :unknown

nested_container "#{Utils.basename}/MCS7830_v#{version}.dmg"
container :nested => "#{Utils.basename}/MCS7830_v#{version}.dmg"
pkg "MCS7830 v#{version}.pkg"
# todo, is "uninstal" below (one "l") a typo, or is that really the
# file in the package?
Expand Down
2 changes: 1 addition & 1 deletion Casks/menucalendarclock-ical.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ class MenucalendarclockIcal < Cask
sha256 '7c78428fd22d0a3fa02e5df4c92fbb45dad881a7ba09205dc47c4bfaaf7f7f9e'

url "http://www.objectpark.net/download/MenuCalendarClock-#{version}.dmg.gz"
nested_container "menucalendarclock-ical-#{version}"
container :nested => "menucalendarclock-ical-#{version}"
homepage 'http://www.objectpark.net/en/mcc.html'
license :unknown

Expand Down
2 changes: 1 addition & 1 deletion Casks/menuola.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ class Menuola < Cask
homepage 'http://www.geocom.co.nz'
license :unknown

nested_container 'Menuola.dmg'
container :nested => 'Menuola.dmg'
app 'Menuola.app'
end
2 changes: 1 addition & 1 deletion Casks/raw-photo-processor.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ class RawPhotoProcessor < Cask
homepage 'http://www.raw-photo-processor.com/RPP/Overview.html'
license :unknown

nested_container 'RPP472_1672_64.dmg'
container :nested => 'RPP472_1672_64.dmg'
app 'Raw Photo Processor 64.app'
end
2 changes: 1 addition & 1 deletion Casks/raw-therapee.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ class RawTherapee < Cask
homepage 'http://rawtherapee.com'
license :unknown

nested_container "RawTherapee_OSX_10.7_64_#{version}.dmg"
container :nested => "RawTherapee_OSX_10.7_64_#{version}.dmg"
app 'RawTherapee.app'
end
2 changes: 1 addition & 1 deletion Casks/refresh-finder.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ class RefreshFinder < Cask
homepage 'http://soderhavet.com/refresh/refresh-finder/'
license :unknown

nested_container "Refresh_Finder_#{version}.dmg"
container :nested => "Refresh_Finder_#{version}.dmg"
app 'Refresh Finder.app'
end
2 changes: 1 addition & 1 deletion Casks/sharetool.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ class Sharetool < Cask
homepage 'http://bainsware.com/'
license :unknown

nested_container 'ShareTool 2.dmg'
container :nested => 'ShareTool 2.dmg'
app 'ShareTool.app'
end
2 changes: 1 addition & 1 deletion Casks/silo.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ class Silo < Cask
url 'https://nevercenter.com/download/Install_Silo_2_3_02_mac.zip'
homepage 'http://nevercenter.com/silo/'
license :unknown
nested_container 'Install_Silo_2_3_02_mac.dmg'
container :nested => 'Install_Silo_2_3_02_mac.dmg'

app 'Silo 2.3.app'
end
2 changes: 1 addition & 1 deletion Casks/snes9x.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ class Snes9x < Cask
url "http://files.ipherswipsite.com/snes9x/snes9x-#{version}-macosx-113.dmg.gz"
homepage 'http://www.snes9x.com/'
license :unknown
nested_container "snes9x-#{version}"
container :nested => "snes9x-#{version}"

app 'Snes9x.app'
end
2 changes: 1 addition & 1 deletion Casks/thumbsup.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ class Thumbsup < Cask
homepage 'http://www.devontechnologies.com/products/freeware.html#c966'
license :unknown

nested_container 'ThumbsUp.dmg'
container :nested => 'ThumbsUp.dmg'
app 'ThumbsUp.app'
end
2 changes: 1 addition & 1 deletion Casks/timemachinescheduler.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ class Timemachinescheduler < Cask
homepage 'http://www.klieme.com/TimeMachineScheduler.html'
license :unknown

nested_container 'TimeMachineScheduler3_Installer.dmg'
container :nested => 'TimeMachineScheduler3_Installer.dmg'
prefpane 'TimeMachineScheduler3_Installer.app/Contents/Resources/TimeMachineScheduler.prefPane'
end
2 changes: 1 addition & 1 deletion Casks/waterroof.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ class Waterroof < Cask
homepage 'http://www.hanynet.com/waterroof/index.html'
license :oss

nested_container "WaterRoof #{version}.dmg"
container :nested => "WaterRoof #{version}.dmg"
app 'WaterRoof.app'
end