Merge pull request #6579 from rolandwalker/mass_change_container_nested

Change 37 Casks to use `container :nested`
Homebrew · Oct 9, 2014 · dd7d2db · dd7d2db
2 parents d69732b + 9165122
commit dd7d2db
Show file tree

Hide file tree

Showing 37 changed files with 38 additions and 37 deletions.
diff --git a/Casks/a-slower-speed-of-light.rb b/Casks/a-slower-speed-of-light.rb
@@ -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
diff --git a/Casks/anonym.rb b/Casks/anonym.rb
@@ -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
diff --git a/Casks/anxiety.rb b/Casks/anxiety.rb
@@ -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
diff --git a/Casks/au-lab.rb b/Casks/au-lab.rb
@@ -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
diff --git a/Casks/avogadro.rb b/Casks/avogadro.rb
@@ -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
diff --git a/Casks/ax88179.rb b/Casks/ax88179.rb
@@ -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
diff --git a/Casks/ax88772.rb b/Casks/ax88772.rb
@@ -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
diff --git a/Casks/bassjump.rb b/Casks/bassjump.rb
@@ -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
 

diff --git a/Casks/capsee.rb b/Casks/capsee.rb
@@ -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
diff --git a/Casks/decitime.rb b/Casks/decitime.rb
@@ -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
diff --git a/Casks/devonthink-pro-office.rb b/Casks/devonthink-pro-office.rb
@@ -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'

diff --git a/Casks/devonthink-pro.rb b/Casks/devonthink-pro.rb
@@ -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
diff --git a/Casks/djview.rb b/Casks/djview.rb
@@ -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
diff --git a/Casks/duplicate-annihilator.rb b/Casks/duplicate-annihilator.rb
@@ -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
diff --git a/Casks/dupscanub.rb b/Casks/dupscanub.rb
@@ -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
diff --git a/Casks/fenix.rb b/Casks/fenix.rb
@@ -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
diff --git a/Casks/git-annex.rb b/Casks/git-annex.rb
@@ -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

diff --git a/Casks/hush.rb b/Casks/hush.rb
@@ -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
diff --git a/Casks/icefloor.rb b/Casks/icefloor.rb
@@ -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
diff --git a/Casks/intel-haxm.rb b/Casks/intel-haxm.rb
@@ -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
diff --git a/Casks/intel-power-gadget.rb b/Casks/intel-power-gadget.rb
@@ -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
diff --git a/Casks/jetphoto-studio.rb b/Casks/jetphoto-studio.rb
@@ -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
diff --git a/Casks/macmoney.rb b/Casks/macmoney.rb
@@ -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
diff --git a/Casks/mailfollowup.rb b/Casks/mailfollowup.rb
@@ -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',

diff --git a/Casks/mass-replace-it.rb b/Casks/mass-replace-it.rb
@@ -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/'

diff --git a/Casks/mcs783x.rb b/Casks/mcs783x.rb
@@ -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?

diff --git a/Casks/menucalendarclock-ical.rb b/Casks/menucalendarclock-ical.rb
@@ -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
 

diff --git a/Casks/menuola.rb b/Casks/menuola.rb
@@ -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
diff --git a/Casks/raw-photo-processor.rb b/Casks/raw-photo-processor.rb
@@ -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
diff --git a/Casks/raw-therapee.rb b/Casks/raw-therapee.rb
@@ -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
diff --git a/Casks/refresh-finder.rb b/Casks/refresh-finder.rb
@@ -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
diff --git a/Casks/sharetool.rb b/Casks/sharetool.rb
@@ -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
diff --git a/Casks/silo.rb b/Casks/silo.rb
@@ -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
diff --git a/Casks/snes9x.rb b/Casks/snes9x.rb
@@ -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
diff --git a/Casks/thumbsup.rb b/Casks/thumbsup.rb
@@ -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
diff --git a/Casks/timemachinescheduler.rb b/Casks/timemachinescheduler.rb
@@ -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
diff --git a/Casks/waterroof.rb b/Casks/waterroof.rb
@@ -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