diff --git a/Casks/abgx360.rb b/Casks/abgx360.rb index 1018a503465bf..0cda1da0cedcb 100644 --- a/Casks/abgx360.rb +++ b/Casks/abgx360.rb @@ -5,7 +5,7 @@ class Abgx360 < Cask url 'http://dl.dropbox.com/u/59058148/abgx360-1.0.6.pkg' homepage 'http://abgx360.net/' - install 'abgx360-1.0.6.pkg' + pkg 'abgx360-1.0.6.pkg' uninstall :quit => 'net.abgx360.abgx360gui', :pkgutil => [ 'net.abgx360.abgx360.pkg', diff --git a/Casks/actual-odbc-pack.rb b/Casks/actual-odbc-pack.rb index 65e538f1fb2ac..493cd6049d53f 100644 --- a/Casks/actual-odbc-pack.rb +++ b/Casks/actual-odbc-pack.rb @@ -5,7 +5,7 @@ class ActualOdbcPack < Cask url 'http://actualtechnologies.cachefly.net/Actual_ODBC_Pack.dmg' homepage 'http://www.actualtech.com/products.php' - install 'Actual ODBC Pack.pkg' + pkg 'Actual ODBC Pack.pkg' uninstall :pkgutil => ['com.actualtechnologies.odbcdriver.*', 'com.actualtechnologies.odbcmanager.pkg'] diff --git a/Casks/adobe-digital-editions.rb b/Casks/adobe-digital-editions.rb index fbdc9498290d3..c66a897ac22ae 100644 --- a/Casks/adobe-digital-editions.rb +++ b/Casks/adobe-digital-editions.rb @@ -5,6 +5,6 @@ class AdobeDigitalEditions < Cask url 'http://download.adobe.com/pub/adobe/digitaleditions/ADE_3.0_Installer.dmg' homepage 'http://www.adobe.com/pt/products/digital-editions.html' - install 'Digital Editions 3.0 Installer.pkg' + pkg 'Digital Editions 3.0 Installer.pkg' uninstall :pkgutil => 'com.adobe.adobedigitaleditions.app' end diff --git a/Casks/adobe-dng-converter.rb b/Casks/adobe-dng-converter.rb index 530655f24cf49..a70ea3c77e57b 100644 --- a/Casks/adobe-dng-converter.rb +++ b/Casks/adobe-dng-converter.rb @@ -5,7 +5,7 @@ class AdobeDngConverter < Cask url "http://download.adobe.com/pub/adobe/dng/mac/DNGConverter_#{version.gsub('.', '_')}.dmg" homepage 'http://www.adobe.com/support/downloads/product.jsp?product=106&platform=Macintosh' - install 'Adobe DNG Converter.pkg' + pkg 'Adobe DNG Converter.pkg' uninstall :pkgutil => 'com.adobe.adobeDngConverter*', :quit => 'com.adobe.DNGConverter' end diff --git a/Casks/adobe-photoshop-lightroom.rb b/Casks/adobe-photoshop-lightroom.rb index 32a38c01e9fb3..75fd98ed0c945 100644 --- a/Casks/adobe-photoshop-lightroom.rb +++ b/Casks/adobe-photoshop-lightroom.rb @@ -5,7 +5,7 @@ class AdobePhotoshopLightroom < Cask url 'http://download.adobe.com/pub/adobe/lightroom/mac/5.x/Lightroom_5_LS11_mac_5_6.dmg' homepage 'http://www.adobe.com/products/photoshop-lightroom.html' - install 'Adobe Photoshop Lightroom 5.pkg' + pkg 'Adobe Photoshop Lightroom 5.pkg' uninstall :pkgutil => 'com.adobe.Lightroom5', :quit => 'com.adobe.Lightroom5', :files => '/Applications/Adobe Photoshop Lightroom 5.app' diff --git a/Casks/adobe-reader.rb b/Casks/adobe-reader.rb index 4a02279187226..f3ec0a736911e 100644 --- a/Casks/adobe-reader.rb +++ b/Casks/adobe-reader.rb @@ -5,6 +5,6 @@ class AdobeReader < Cask url 'http://ardownload.adobe.com/pub/adobe/reader/mac/11.x/11.0.07/en_US/AdbeRdr11007_en_US.dmg' homepage 'http://www.adobe.com/products/reader.html' - install 'Adobe Reader XI Installer.pkg' + pkg 'Adobe Reader XI Installer.pkg' uninstall :pkgutil => 'com.adobe.acrobat.reader.11007.*' end diff --git a/Casks/airdisplay.rb b/Casks/airdisplay.rb index 38e9b2facdca0..4813b4877909b 100644 --- a/Casks/airdisplay.rb +++ b/Casks/airdisplay.rb @@ -5,6 +5,6 @@ class Airdisplay < Cask url 'http://downloads.avatron.com/AirDisplayInstaller.zip' homepage 'http://avatron.com/apps/air-display/' - install 'Air Display Installer.pkg' + pkg 'Air Display Installer.pkg' uninstall :pkgutil => 'com.avatron.pkg.AirDisplay' end diff --git a/Casks/alinof-timer.rb b/Casks/alinof-timer.rb index afd40864c775a..56861781d27e8 100644 --- a/Casks/alinof-timer.rb +++ b/Casks/alinof-timer.rb @@ -5,6 +5,6 @@ class AlinofTimer < Cask url 'http://www.alinofsoftware.ch/resources/AlinofTimer.pkg' homepage 'http://www.alinofsoftware.ch/en/products/products-timer/index.html' - install 'AlinofTimer.pkg', :allow_untrusted => true + pkg 'AlinofTimer.pkg', :allow_untrusted => true uninstall :pkgutil => 'com.alinofsoftware.alinoftimer' end diff --git a/Casks/aquaterm.rb b/Casks/aquaterm.rb index 93cf74ee01ef7..de96d4ff0c1a1 100644 --- a/Casks/aquaterm.rb +++ b/Casks/aquaterm.rb @@ -5,6 +5,6 @@ class Aquaterm < Cask url 'https://downloads.sourceforge.net/project/aquaterm/AquaTerm/v1.1.1/AquaTerm-1.1.1.dmg' homepage 'http://aquaterm.sourceforge.net/' - install 'AquaTermInstaller.pkg' + pkg 'AquaTermInstaller.pkg' uninstall :pkgutil => 'net.sourceforge.aquaterm.aquaterm.*' end diff --git a/Casks/asepsis.rb b/Casks/asepsis.rb index 5200025dc69b8..6f4b51b6c0fb2 100644 --- a/Casks/asepsis.rb +++ b/Casks/asepsis.rb @@ -5,6 +5,6 @@ class Asepsis < Cask url "http://downloads.binaryage.com/Asepsis-#{version}.dmg" homepage 'http://asepsis.binaryage.com/' - install 'Asepsis.pkg' + pkg 'Asepsis.pkg' uninstall :pkgutil => 'com.binaryage.pkg.asepsis' end diff --git a/Casks/authbuddy.rb b/Casks/authbuddy.rb index f6a4113079187..7e70c41a19891 100644 --- a/Casks/authbuddy.rb +++ b/Casks/authbuddy.rb @@ -5,7 +5,7 @@ class Authbuddy < Cask url 'https://www.dssw.co.uk/authbuddy/dsswauthbuddy.dmg' homepage 'https://www.dssw.co.uk/authbuddy' - install 'DssW authbuddy.pkg' + pkg 'DssW authbuddy.pkg' uninstall :files => '/usr/local/bin/authbuddy' caveats do files_in_usr_local diff --git a/Casks/authoxy.rb b/Casks/authoxy.rb index 5ff9985078b11..d1d09a02ba64f 100644 --- a/Casks/authoxy.rb +++ b/Casks/authoxy.rb @@ -5,7 +5,7 @@ class Authoxy < Cask url 'http://www.hrsoftworks.net/downloads/Authoxy3.6.dmg' homepage 'http://www.hrsoftworks.net' - install 'Authoxy (double click me).pkg' + pkg 'Authoxy (double click me).pkg' uninstall :pkgutil => 'net.hrsoftworks.authoxy.*', :files => [ "#{ENV['HOME']}/Library/Preferences/net.hrsoftworks.AuthoxyPref.plist", diff --git a/Casks/ax88179.rb b/Casks/ax88179.rb index f7f963b34c028..66c4fa81430fa 100644 --- a/Casks/ax88179.rb +++ b/Casks/ax88179.rb @@ -8,6 +8,6 @@ class Ax88179 < Cask sha256 '26b3dac14839d93db175c5a5d11083578f3171333f8f7d6574cde389cf58a991' nested_container "#{basename}/AX88179_178A.dmg" - install "AX88179_178A_v#{version[0..-10]}.pkg" + 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 index 4a79bbe7b4845..d1dfa75d72abd 100644 --- a/Casks/ax88772.rb +++ b/Casks/ax88772.rb @@ -8,6 +8,6 @@ class Ax88772 < Cask sha256 'ea7b2c401855c991cfd9d147632d5bf0478c99a4be034575301eb8549404391f' nested_container "#{basename}/AX88772.dmg" - install "AX88772_v#{version[0..-10]}.pkg" + pkg "AX88772_v#{version[0..-10]}.pkg" uninstall :script => { :executable => 'AX88772C_772B_772A_760_772_Uninstall_v130' } end diff --git a/Casks/baiduinput.rb b/Casks/baiduinput.rb index 1b309a8ccdef1..5241bb57666d9 100644 --- a/Casks/baiduinput.rb +++ b/Casks/baiduinput.rb @@ -6,7 +6,7 @@ class Baiduinput < Cask url "http://wuxian.baidu.com/download/1000e/baiduinput_mac_v#{version}.dmg" homepage 'http://wuxian.baidu.com/input/mac.html' - install '安装百度输入法.pkg' + pkg '安装百度输入法.pkg' uninstall :pkgutil => 'com.baidu.inputmethod.*', :files => [ '/Library/Input Methods/BaiduIM.app' diff --git a/Casks/bankid.rb b/Casks/bankid.rb index 37a6a970bf19a..41aed7716d7f1 100644 --- a/Casks/bankid.rb +++ b/Casks/bankid.rb @@ -10,6 +10,6 @@ class Bankid < Cask system '/bin/mv', '--', destination_path.join('FileDownloader'), destination_path.join('bankid-latest.pkg') end - install 'bankid-latest.pkg' + pkg 'bankid-latest.pkg' uninstall :pkgutil => 'com.bankid.bankid.BankID.pkg' end diff --git a/Casks/basecamp.rb b/Casks/basecamp.rb index bc0a412d60d06..5105a93991be6 100644 --- a/Casks/basecamp.rb +++ b/Casks/basecamp.rb @@ -5,6 +5,6 @@ class Basecamp < Cask url "http://download.garmin.com/software/BaseCampforMac_#{version.gsub('.', '')}.dmg" homepage 'http://www.garmin.com/en-US/shop/downloads/basecamp' - install 'Install BaseCamp.pkg' + pkg 'Install BaseCamp.pkg' uninstall :pkgutil => 'com.garmin.BaseCamp' end diff --git a/Casks/basictex.rb b/Casks/basictex.rb index c307710f3a438..faab7ff3a9077 100644 --- a/Casks/basictex.rb +++ b/Casks/basictex.rb @@ -5,7 +5,7 @@ class Basictex < Cask url "http://mirror.ctan.org/systems/mac/mactex/basictex#{version}.pkg" homepage 'http://www.tug.org/mactex/morepackages.html' - install "basictex#{version}.pkg" + pkg "basictex#{version}.pkg" uninstall :pkgutil => 'org.tug.mactex.basictex2014' caveats do path_environment_variable '/usr/texbin' diff --git a/Casks/bassjump.rb b/Casks/bassjump.rb index a5b1f617eb223..44f769316859b 100644 --- a/Casks/bassjump.rb +++ b/Casks/bassjump.rb @@ -3,13 +3,13 @@ class Bassjump < Cask url 'http://ffe82a399885f9f28605-66638985576304cbe11c530b9b932f18.r24.cf2.rackcdn.com/BassJumpSoundSystem-2.0.3-249-ML.mpkg.zip' version '2.0.3' sha256 '8e4dffa6bb3b532b994f379d19d70903f59fc019916f10cba9d01b8075d69a7f' - install 'BassJump Sound System-2.0.3-249-ML.mpkg' + pkg 'BassJump Sound System-2.0.3-249-ML.mpkg' else url 'http://ffe82a399885f9f28605-66638985576304cbe11c530b9b932f18.r24.cf2.rackcdn.com/BassJumpInstaller_2.5.1.dmg.zip' version '2.5.1' sha256 '14408480cded51f6334753639e973ebbf2fc40f34ff64e1c35d2f32507d88afd' nested_container 'BassJumpInstaller_2.5.1.dmg' - install 'BassJumpInstaller.pkg' + pkg 'BassJumpInstaller.pkg' end homepage 'http://www.twelvesouth.com/product/bassjump-2-for-macbook' caveats do diff --git a/Casks/bitcasa.rb b/Casks/bitcasa.rb index 0ae51bfbe60e3..f97e67d14fa2c 100644 --- a/Casks/bitcasa.rb +++ b/Casks/bitcasa.rb @@ -5,6 +5,6 @@ class Bitcasa < Cask url 'https://d1kbf262vwnlmm.cloudfront.net/Bitcasa_1.4.1387.dmg' homepage 'https://www.bitcasa.com' - install 'InstallBitcasa.pkg' + pkg 'InstallBitcasa.pkg' uninstall :pkgutil => 'com.bitcasa.AutoLaunch|com.bitcasa.Bitcasa' end diff --git a/Casks/boot2docker.rb b/Casks/boot2docker.rb index 7fb7a987d2526..c235887a1f6d7 100644 --- a/Casks/boot2docker.rb +++ b/Casks/boot2docker.rb @@ -5,6 +5,6 @@ class Boot2docker < Cask url 'https://github.com/boot2docker/osx-installer/releases/download/v1.2.0/Boot2Docker-1.2.0.pkg' homepage 'https://github.com/boot2docker/osx-installer' - install 'Boot2Docker-1.2.0.pkg' + pkg 'Boot2Docker-1.2.0.pkg' uninstall :pkgutil => ['io.boot2docker.pkg.boot2docker', 'io.boot2docker.pkg.boot2dockerapp', 'io.boot2dockeriso.pkg.boot2dockeriso', 'io.docker.pkg.docker'] end diff --git a/Casks/boxcryptor-classic.rb b/Casks/boxcryptor-classic.rb index 87040b2bd94d5..504bd5dc7d5fe 100644 --- a/Casks/boxcryptor-classic.rb +++ b/Casks/boxcryptor-classic.rb @@ -5,6 +5,6 @@ class BoxcryptorClassic < Cask url 'https://www.boxcryptor.com/download/Boxcryptor_Installer.dmg' homepage 'https://www.boxcryptor.com/en/boxcryptor-classic' - install 'Install Boxcryptor Classic.pkg' + pkg 'Install Boxcryptor Classic.pkg' uninstall :script => { :executable => 'Uninstall.command', :args => %w[--unattended] } end diff --git a/Casks/brytonbridge.rb b/Casks/brytonbridge.rb index 177384b326243..bc30cea9a15ed 100644 --- a/Casks/brytonbridge.rb +++ b/Casks/brytonbridge.rb @@ -5,7 +5,7 @@ class Brytonbridge < Cask url 'http://static.brytonsport.com/uploads/www/Software/version/14/BrytonBridge2.pkg' homepage 'http://www.brytonsport.com/help/start' - install 'BrytonBridge2.pkg' + pkg 'BrytonBridge2.pkg' uninstall :pkgutil => 'com.brytonsport.pkg.BrytonBridge2', :quit => 'com.yourcompany.BrytonBridge', :files => [ diff --git a/Casks/callnote.rb b/Casks/callnote.rb index b3cee1f83b431..4131184eb7c0f 100644 --- a/Casks/callnote.rb +++ b/Casks/callnote.rb @@ -5,6 +5,6 @@ class Callnote < Cask url 'http://callnote.kandasoft.com/callnote-premium-install-2.3.7.pkg' homepage 'http://www.kandasoft.com/home/kanda-apps/skype-call-recorder.html' - install 'callnote-premium-install-2.3.7.pkg' + pkg 'callnote-premium-install-2.3.7.pkg' uninstall :pkgutil => 'callnote-pro' end diff --git a/Casks/camtwist.rb b/Casks/camtwist.rb index 93fca7f45be28..2fe1de4998a16 100644 --- a/Casks/camtwist.rb +++ b/Casks/camtwist.rb @@ -5,6 +5,6 @@ class Camtwist < Cask url 'http://camtwiststudio.com/release/CamTwist_2.5.dmg' homepage 'http://camtwiststudio.com/' - install 'CamTwist.pkg' + pkg 'CamTwist.pkg' uninstall :script => { :executable => 'Manual Install/CamTwist/uninstall.command' } end diff --git a/Casks/carlson-minot.rb b/Casks/carlson-minot.rb index bd3503ec066f7..13141956b2b42 100644 --- a/Casks/carlson-minot.rb +++ b/Casks/carlson-minot.rb @@ -5,7 +5,7 @@ class CarlsonMinot < Cask url 'https://www.carlson-minot.com/downloads/arm-2013.05-24-arm-none-linux-gnueabi.osx.intelx86.bin.pkg' homepage 'http://www.carlson-minot.com' - install 'arm-2013.05-24-arm-none-linux-gnueabi.osx.intelx86.bin.pkg' + pkg 'arm-2013.05-24-arm-none-linux-gnueabi.osx.intelx86.bin.pkg' uninstall :pkgutil => 'com.carlson-minot.arm-2013.05-24-arm-none-linux-gnueabi.pkg', :files => [ '/usr/local/carlson-minot' ] caveats do diff --git a/Casks/cartao-de-cidadao.rb b/Casks/cartao-de-cidadao.rb index 4f80732359969..165db7f0f8207 100644 --- a/Casks/cartao-de-cidadao.rb +++ b/Casks/cartao-de-cidadao.rb @@ -5,6 +5,6 @@ class CartaoDeCidadao < Cask url "http://www.cartaodecidadao.pt/ccsoftware/Cartao_de_Cidadao_#{version}_LION_MOUNTAIN_LION_MAVERICKS.dmg" homepage 'http://www.cartaodecidadao.pt/' - install 'Cartao_de_Cidadao.pkg' + pkg 'Cartao_de_Cidadao.pkg' uninstall :script => '/usr/local/bin/pteid_uninstall.sh' end diff --git a/Casks/chefdk.rb b/Casks/chefdk.rb index 4d70001280180..463f9c3e50966 100644 --- a/Casks/chefdk.rb +++ b/Casks/chefdk.rb @@ -5,7 +5,7 @@ class Chefdk < Cask url 'https://opscode-omnibus-packages.s3.amazonaws.com/mac_os_x/10.8/x86_64/chefdk-0.2.1-1.dmg' homepage 'http://www.getchef.com/downloads/chef-dk/mac/' - install 'chefdk.pkg' + pkg 'chefdk.pkg' uninstall :pkgutil => 'com.getchef.pkg.chefdk', :files => [ '/opt/chefdk/', diff --git a/Casks/chrome-remote-desktop-host.rb b/Casks/chrome-remote-desktop-host.rb index 92dafd4cdf263..915043a120a21 100644 --- a/Casks/chrome-remote-desktop-host.rb +++ b/Casks/chrome-remote-desktop-host.rb @@ -5,7 +5,7 @@ class ChromeRemoteDesktopHost < Cask url 'https://dl.google.com/chrome-remote-desktop/chromeremotedesktop.dmg' homepage 'https://chrome.google.com/remotedesktop' - install 'Chrome Remote Desktop Host.pkg' + pkg 'Chrome Remote Desktop Host.pkg' uninstall :script => { :executable => '/Applications/Chrome Remote Desktop Host Uninstaller.app/Contents/MacOS/remoting_host_uninstaller', :args => %w[--no-ui] diff --git a/Casks/chronoagent.rb b/Casks/chronoagent.rb index 860577b5b0354..164d2846850f5 100644 --- a/Casks/chronoagent.rb +++ b/Casks/chronoagent.rb @@ -5,6 +5,6 @@ class Chronoagent < Cask url 'http://downloads.econtechnologies.com/CA_Mac_Download.dmg' homepage 'http://www.econtechnologies.com' - install 'Install.pkg' + pkg 'Install.pkg' uninstall :pkgutil => 'com.econtechnologies.pkg.ChronoAgent' end diff --git a/Casks/chronosync.rb b/Casks/chronosync.rb index bdc164e24d98f..cdff2fd9f1069 100644 --- a/Casks/chronosync.rb +++ b/Casks/chronosync.rb @@ -5,6 +5,6 @@ class Chronosync < Cask url 'http://downloads.econtechnologies.com/CS4_Download.dmg' homepage 'http://www.econtechnologies.com' - install 'Install.pkg' + pkg 'Install.pkg' uninstall :pkgutil => 'com.econtechnologies.pkg.ChronoSyncApplication' end diff --git a/Casks/citrix-receiver.rb b/Casks/citrix-receiver.rb index 158c696c7f86f..1e4d1fb5446f8 100644 --- a/Casks/citrix-receiver.rb +++ b/Casks/citrix-receiver.rb @@ -5,7 +5,7 @@ class CitrixReceiver < Cask url 'http://downloadplugins.citrix.com.edgesuite.net/Mac/CitrixReceiverWeb.dmg' homepage 'http://www.citrix.com/receiver' - install 'Install Citrix Receiver.pkg' + pkg 'Install Citrix Receiver.pkg' uninstall :launchctl => [ 'com.citrix.AuthManager_Mac', 'com.citrix.ReceiverHelper', diff --git a/Casks/cloudera-hive-odbc.rb b/Casks/cloudera-hive-odbc.rb index c814e65d61304..33fe521828931 100644 --- a/Casks/cloudera-hive-odbc.rb +++ b/Casks/cloudera-hive-odbc.rb @@ -5,7 +5,7 @@ class ClouderaHiveOdbc < Cask url 'https://downloads.cloudera.com/connectors/hive-2.5.5.1006/MacOSX/ClouderaHiveODBC.dmg' homepage 'http://www.cloudera.com' - install 'ClouderaHiveODBC.pkg' + pkg 'ClouderaHiveODBC.pkg' uninstall :pkgutil => 'cloudera.hiveodbc' caveats do <<-EOS.undent diff --git a/Casks/cloudfoundry-cli.rb b/Casks/cloudfoundry-cli.rb index beb6f117638a1..72402cc6c08ba 100644 --- a/Casks/cloudfoundry-cli.rb +++ b/Casks/cloudfoundry-cli.rb @@ -5,7 +5,7 @@ class CloudfoundryCli < Cask url 'http://go-cli.s3-website-us-east-1.amazonaws.com/releases/v6.2.0/installer-osx-amd64.pkg' homepage 'https://github.com/cloudfoundry/cli' - install 'installer-osx-amd64.pkg' + pkg 'installer-osx-amd64.pkg' uninstall :pkgutil => 'com.pivotal.cloudfoundry.pkg' caveats do files_in_usr_local diff --git a/Casks/cocoaspell.rb b/Casks/cocoaspell.rb index 54a54cdd9f66d..9b1da2438bb13 100644 --- a/Casks/cocoaspell.rb +++ b/Casks/cocoaspell.rb @@ -5,7 +5,7 @@ class Cocoaspell < Cask url 'http://people.ict.usc.edu/~leuski/cocoaspell/cocoAspell.2.1.dmg' homepage 'http://cocoaspell.leuski.net/' - install 'cocoAspell.pkg' + pkg 'cocoAspell.pkg' uninstall :pkgutil => 'net.leuski.cocoaspell.*', :files => [ '/Application Support/cocoAspell/aspell6-en-6.0-0', '/Library/PreferencePanes/Spelling.prefPane' diff --git a/Casks/controllermate.rb b/Casks/controllermate.rb index f297f4106508a..23dbe09488539 100644 --- a/Casks/controllermate.rb +++ b/Casks/controllermate.rb @@ -5,6 +5,6 @@ class Controllermate < Cask url 'https://s3.amazonaws.com/orderedbytes/ControllerMate.dmg' homepage 'http://www.orderedbytes.com/controllermate/' - install 'ControllerMate.pkg' + pkg 'ControllerMate.pkg' uninstall :script => 'ControllerMate Uninstaller.app/Contents/MacOS/ControllerMate Uninstaller' end diff --git a/Casks/craftstudio.rb b/Casks/craftstudio.rb index 0804e7620536c..7843495958ab6 100644 --- a/Casks/craftstudio.rb +++ b/Casks/craftstudio.rb @@ -5,7 +5,7 @@ class Craftstudio < Cask url 'http://craftstud.io/files/OSX/CraftStudio.pkg' homepage 'http://craftstud.io' - install 'CraftStudio.pkg' + pkg 'CraftStudio.pkg' uninstall :quit => 'com.sparklinlabs.CraftStudioLauncher', :pkgutil => 'com.sparklinlabs.CraftStudioLauncher' diff --git a/Casks/crashplan.rb b/Casks/crashplan.rb index 8775efaa456f4..3b72ef7f551d2 100644 --- a/Casks/crashplan.rb +++ b/Casks/crashplan.rb @@ -5,7 +5,7 @@ class Crashplan < Cask url 'http://download.crashplan.com/installs/mac/install/CrashPlan/CrashPlan_3.6.3_Mac.dmg' homepage 'http://www.crashplan.com/' - install 'Install CrashPlan.pkg' + pkg 'Install CrashPlan.pkg' uninstall :script => 'Uninstall.app/Contents/Resources/uninstall.sh', :pkgutil => 'com.crashplan.app.pkg' end diff --git a/Casks/crosspack-avr.rb b/Casks/crosspack-avr.rb index 348b8e5c4a876..05ff6d41c4fc3 100644 --- a/Casks/crosspack-avr.rb +++ b/Casks/crosspack-avr.rb @@ -5,7 +5,7 @@ class CrosspackAvr < Cask url 'http://www.obdev.at/downloads/crosspack/CrossPack-AVR-20131216.dmg' homepage 'http://www.obdev.at/products/crosspack/' - install 'CrossPack-AVR.pkg' + pkg 'CrossPack-AVR.pkg' uninstall_postflight do IO.popen('/usr/bin/yes | /usr/bin/sudo -E -- /usr/local/CrossPack-AVR/uninstall && /usr/bin/sudo -- /usr/sbin/pkgutil --forget at.obdev.CrossPack-AVR', 'r+') do |pipe| pipe.close_write diff --git a/Casks/cups-pdf.rb b/Casks/cups-pdf.rb index fb97291271c0a..78381a2526697 100644 --- a/Casks/cups-pdf.rb +++ b/Casks/cups-pdf.rb @@ -5,6 +5,6 @@ class CupsPdf < Cask url 'https://bitbucket.org/codepoet/cups-pdf-for-mac-os-x/downloads/CUPS-PDF%202.6.1%20Installer.pkg' homepage 'http://www.cups-pdf.de' - install 'CUPS-PDF.mpkg' + pkg 'CUPS-PDF.mpkg' uninstall :pkgutil => 'net.codepoetry.cupspdf.*pkg' end diff --git a/Casks/cycling74-max.rb b/Casks/cycling74-max.rb index 5a7f13794f7d6..af755b3738ba1 100644 --- a/Casks/cycling74-max.rb +++ b/Casks/cycling74-max.rb @@ -5,7 +5,7 @@ class Cycling74Max < Cask url 'https://akiaj5esl75o5wbdcv2a-maxmspjitter.s3.amazonaws.com/Max617_140421.dmg' homepage 'http://cycling74.com' - install 'Max 6.1 Installer.pkg' + pkg 'Max 6.1 Installer.pkg' uninstall :pkgutil => 'com.cycling74.Max*', :files => '/Applications/Max 6.1' end diff --git a/Casks/displaylink.rb b/Casks/displaylink.rb index fb0ac547bc936..f7c1b7175bed8 100644 --- a/Casks/displaylink.rb +++ b/Casks/displaylink.rb @@ -9,7 +9,7 @@ class Displaylink < Cask homepage 'http://www.displaylink.com' version '2.2' sha256 '5c9a97a476b5ff27811491eebb653a03c96f899562b67566c24100d8593b1daa' - install 'DisplayLink Software Installer.pkg' + pkg 'DisplayLink Software Installer.pkg' uninstall :pkgutil => ['com.displaylink.displaylinkdriversigned', 'com.displaylink.displaylinkdriverunsigned'] # :kext => ['com.displaylink.driver.DisplayLinkDriver', diff --git a/Casks/dmm.rb b/Casks/dmm.rb index a559af4f90c36..fae2eeb4a3fe0 100644 --- a/Casks/dmm.rb +++ b/Casks/dmm.rb @@ -5,6 +5,6 @@ class Dmm < Cask url 'https://www.dmm.co.jp/transfer/-/dmmviewer/=/device=mac/' homepage 'http://www.dmm.com/dc/book/' - install 'DMMViewer.pkg' + pkg 'DMMViewer.pkg' uninstall :pkgutil => 'jp.co.cyphertec.installer.app.ImageViewer' end diff --git a/Casks/dnscrypt.rb b/Casks/dnscrypt.rb index 0bad46e24c54b..72fb4333e214f 100644 --- a/Casks/dnscrypt.rb +++ b/Casks/dnscrypt.rb @@ -5,7 +5,7 @@ class Dnscrypt < Cask url 'https://github.com/alterstep/dnscrypt-osxclient/releases/download/1.0.3/dnscrypt-osxclient-1.0.3.dmg' homepage 'http://opendns.github.io/dnscrypt-osx-client/' - install 'DNSCrypt.mpkg' + pkg 'DNSCrypt.mpkg' uninstall :quit => 'com.github.dnscrypt-osxclient.DNSCrypt-Menubar', :pkgutil => 'com.github.dnscrypt-osxclient.dnscryptClient.*', :launchctl => [ diff --git a/Casks/doublecommand.rb b/Casks/doublecommand.rb index 116cc3a0b1e38..1dccae5cdfa57 100644 --- a/Casks/doublecommand.rb +++ b/Casks/doublecommand.rb @@ -5,6 +5,6 @@ class Doublecommand < Cask url 'http://doublecommand.sourceforge.net/files/DoubleCommand-1.7.dmg' homepage 'http://doublecommand.sourceforge.net' - install 'DoubleCommand-1.7.pkg' + pkg 'DoubleCommand-1.7.pkg' uninstall :script => '/Library/StartupItems/DoubleCommand/uninstall.command' end diff --git a/Casks/drobo-dashboard.rb b/Casks/drobo-dashboard.rb index 23f5447ad63fd..09b61b696fd2f 100644 --- a/Casks/drobo-dashboard.rb +++ b/Casks/drobo-dashboard.rb @@ -5,6 +5,6 @@ class DroboDashboard < Cask url 'http://files.drobo.com/webrelease/dashboard/Drobo-Dashboard-2.5.3.dmg' homepage 'http://www.drobo.com' - install 'Install.app/Contents/Drobo_Dashboard_Installer_2.5.3.pkg' + pkg 'Install.app/Contents/Drobo_Dashboard_Installer_2.5.3.pkg' uninstall :script => 'Uninstall.app/Contents/Resources/Scripts/Drobo_Dashboard_uninstall.sh' end diff --git a/Casks/eagle.rb b/Casks/eagle.rb index 54bcf7c34a7ee..16781406c120d 100644 --- a/Casks/eagle.rb +++ b/Casks/eagle.rb @@ -5,7 +5,7 @@ class Eagle < Cask url "ftp://ftp.cadsoft.de/eagle/program/#{version.gsub(/\.\d$/, '')}/eagle-mac-#{version}.zip" homepage 'http://www.cadsoftusa.com/' - install "eagle-#{version}.pkg" + pkg "eagle-#{version}.pkg" uninstall :pkgutil => 'com.CadSoftComputerGmbH.EAGLE', :files => "/Applications/EAGLE-#{version}" end diff --git a/Casks/eid-mw.rb b/Casks/eid-mw.rb index a0600127a16a1..3b6e711c8b5f8 100644 --- a/Casks/eid-mw.rb +++ b/Casks/eid-mw.rb @@ -5,7 +5,7 @@ class EidMw < Cask url 'https://eid-mw.googlecode.com/files/beid-4.0.6-7422-signed.dmg' homepage 'https://code.google.com/p/eid-mw/' - install 'beid-7422-signed.pkg' + pkg 'beid-7422-signed.pkg' uninstall :pkgutil => 'be.eid.middleware' end diff --git a/Casks/electric-sheep.rb b/Casks/electric-sheep.rb index f6702278a58f9..1b40d74e1b219 100644 --- a/Casks/electric-sheep.rb +++ b/Casks/electric-sheep.rb @@ -5,6 +5,6 @@ class ElectricSheep < Cask url 'https://electricsheep.googlecode.com/files/electricsheep-2.7b35b.dmg' homepage 'http://www.electricsheep.org' - install 'Electric Sheep.mpkg' + pkg 'Electric Sheep.mpkg' uninstall :pkgutil => 'org.electricsheep.electricSheep.*' end diff --git a/Casks/elm-platform.rb b/Casks/elm-platform.rb index d924de176acc9..9595aec82ef1c 100644 --- a/Casks/elm-platform.rb +++ b/Casks/elm-platform.rb @@ -5,7 +5,7 @@ class ElmPlatform < Cask url 'https://dl.dropboxusercontent.com/s/qfz9n90jszcxa5q/Elm-Platform-0.12.3.pkg' homepage 'http://www.elm-lang.org' - install 'Elm-Platform-0.12.3.pkg' + pkg 'Elm-Platform-0.12.3.pkg' uninstall :pkgutil => [ 'org.elm-lang.bin.pkg', 'org.elm-lang.share.pkg' diff --git a/Casks/epubquicklook.rb b/Casks/epubquicklook.rb index 532814f8659ab..3d44c991a1320 100644 --- a/Casks/epubquicklook.rb +++ b/Casks/epubquicklook.rb @@ -5,6 +5,6 @@ class Epubquicklook < Cask url 'http://people.ict.usc.edu/~leuski/programming/EPUBQuickLookPlugin.dmg' homepage 'http://people.ict.usc.edu/~leuski/programming/epub-quickview.php' - install 'EpubQuickLook.pkg' + pkg 'EpubQuickLook.pkg' uninstall :pkgutil => 'net.leuski.epubQuicklookPlugin.epub.pkg' end diff --git a/Casks/escritorio-movistar.rb b/Casks/escritorio-movistar.rb index 80c24130da642..bb41fc409c528 100644 --- a/Casks/escritorio-movistar.rb +++ b/Casks/escritorio-movistar.rb @@ -5,7 +5,7 @@ class EscritorioMovistar < Cask url 'http://www.movistar.es/estaticos/descargaaplicaciones/Escritorio%20Movistar_v8.9.pkg' homepage 'http://www.movistar.es/particulares/servicios/descargaaplicaciones' - install 'Escritorio Movistar_v8.9.pkg' + pkg 'Escritorio Movistar_v8.9.pkg' uninstall :quit => 'com.movistar.tgcm.devel.tme', :pkgutil => [ 'com.ZTE.DatacardDriver.MacV1.3.41NDISICAEM1000.01.02', diff --git a/Casks/eye-fi.rb b/Casks/eye-fi.rb index bfa7fbf6822a8..4aa2ea71aeda6 100644 --- a/Casks/eye-fi.rb +++ b/Casks/eye-fi.rb @@ -5,6 +5,6 @@ class EyeFi < Cask url 'http://download.eyefi.com/x2/3.4.35/Eye-Fi.dmg' homepage 'http://support.eye.fi/downloads' - install 'Eye-Fi.mpkg' + pkg 'Eye-Fi.mpkg' uninstall :pkgutil => 'fi.eye.*' end diff --git a/Casks/facebook-ios-sdk.rb b/Casks/facebook-ios-sdk.rb index ef0047f4ed1a6..e98fbe2b635e2 100644 --- a/Casks/facebook-ios-sdk.rb +++ b/Casks/facebook-ios-sdk.rb @@ -5,6 +5,6 @@ class FacebookIosSdk < Cask url 'https://developers.facebook.com/resources/facebook-ios-sdk-3.17.pkg' homepage 'https://developers.facebook.com/docs/ios' - install 'facebook-ios-sdk-3.17.pkg' + pkg 'facebook-ios-sdk-3.17.pkg' uninstall :pkgutil => 'com.facebook.sdk.pkg' end diff --git a/Casks/fender-amp-drivers.rb b/Casks/fender-amp-drivers.rb index 3658daed74e6b..afc286020ae65 100644 --- a/Casks/fender-amp-drivers.rb +++ b/Casks/fender-amp-drivers.rb @@ -5,6 +5,6 @@ class FenderAmpDrivers < Cask url 'http://support.fender.com/software/fender_software/fender_fuse/mac/FenderFUSE_FULL_2.7.1.dmg' homepage 'https://fuse.fender.com/' - install 'Fender FUSE Installer.app/Contents/Resources/FenderDrivers.pkg' + pkg 'Fender FUSE Installer.app/Contents/Resources/FenderDrivers.pkg' uninstall :pkgutil => 'com.Fender.pkg.FenderAmpDrivers' end diff --git a/Casks/fender-fuse.rb b/Casks/fender-fuse.rb index 0133e1e3d53dc..44d97b75112b5 100644 --- a/Casks/fender-fuse.rb +++ b/Casks/fender-fuse.rb @@ -5,6 +5,6 @@ class FenderFuse < Cask url 'https://www.fmicassets.com/fender/support/software/fender_software/fender_fuse/mac/FenderFUSE_FULL_2.7.1.dmg' homepage 'https://fuse.fender.com/' - install 'Fender FUSE Installer.app/Contents/Resources/Fender FUSE.pkg' + pkg 'Fender FUSE Installer.app/Contents/Resources/Fender FUSE.pkg' uninstall :pkgutil => 'com.Fender.pkg.FenderFUSE', :files => '/Applications/Fender FUSE.app' end diff --git a/Casks/fitbit-connect.rb b/Casks/fitbit-connect.rb index 08a5c66508184..e44e385b4c478 100644 --- a/Casks/fitbit-connect.rb +++ b/Casks/fitbit-connect.rb @@ -5,6 +5,6 @@ class FitbitConnect < Cask url 'http://cache.fitbit.com/FitbitConnect/FitbitConnect_Mac_2014110_1.0.1.5104.dmg' homepage 'http://www.fitbit.com/' - install 'Install Fitbit Connect.pkg' + pkg 'Install Fitbit Connect.pkg' uninstall :script => { :executable => 'Uninstall Fitbit Connect.app/Contents/Resources/uninstall.sh' } end diff --git a/Casks/flash.rb b/Casks/flash.rb index ba2d8d18aa808..8362d891b2ff7 100644 --- a/Casks/flash.rb +++ b/Casks/flash.rb @@ -5,7 +5,7 @@ class Flash < Cask url 'http://fpdownload.macromedia.com/get/flashplayer/current/licensing/mac/install_flash_player_15_osx_pkg.dmg' homepage 'https://www.adobe.com/products/flashplayer/distribution3.html' - install 'Install Adobe Flash Player.pkg' + pkg 'Install Adobe Flash Player.pkg' uninstall :pkgutil => 'com.adobe.pkg.FlashPlayer', :files => '/Library/Internet Plug-Ins/Flash Player.plugin' end diff --git a/Casks/flip4mac.rb b/Casks/flip4mac.rb index f9fe60a527b00..7c58d44866f31 100644 --- a/Casks/flip4mac.rb +++ b/Casks/flip4mac.rb @@ -5,6 +5,6 @@ class Flip4mac < Cask url 'http://dvd-mac.com/download/Flip4Mac_3.2.0.16.dmg' homepage 'http://www.telestream.net/flip4mac/' - install 'Flip4Mac.pkg' + pkg 'Flip4Mac.pkg' uninstall :pkgutil => 'net.telestream.Flip4Mac' end diff --git a/Casks/fluke.rb b/Casks/fluke.rb index 0730912440b58..f8d540198479c 100644 --- a/Casks/fluke.rb +++ b/Casks/fluke.rb @@ -5,6 +5,6 @@ class Fluke < Cask url 'https://flukeformac.googlecode.com/files/Fluke_0.2.5b.zip' homepage 'https://code.google.com/p/flukeformac/' - install 'Fluke_0.2.5.pkg' + pkg 'Fluke_0.2.5.pkg' uninstall :script => { :executable => 'Uninstall Fluke.tool' } end diff --git a/Casks/fpc.rb b/Casks/fpc.rb index 5f7a144c85494..1ec686915335a 100644 --- a/Casks/fpc.rb +++ b/Casks/fpc.rb @@ -5,6 +5,6 @@ class Fpc < Cask url 'https://downloads.sourceforge.net/freepascal/fpc-2.6.2.intel-macosx.dmg' homepage 'http://www.freepascal.org/' - install 'fpc-2.6.2rc1.intel-macosx.pkg' + pkg 'fpc-2.6.2rc1.intel-macosx.pkg' uninstall :pkgutil => 'org.freepascal.freePascalCompiler262.fpcinst386.pkg' end diff --git a/Casks/gambit-c.rb b/Casks/gambit-c.rb index a99314bc650d2..ee5d20406b6b8 100644 --- a/Casks/gambit-c.rb +++ b/Casks/gambit-c.rb @@ -2,11 +2,11 @@ class GambitC < Cask if Hardware::CPU.is_32_bit? url 'http://www.iro.umontreal.ca/~gambit/download/gambit/v4.7/prebuilt/gambc-v4_7_2-macosx-intel32.dmg' sha256 'fb19aceeeac5e7ce4ae7e1a07dbf8ab81906d372fbea56493171aa0bfe47899c' - install 'gambc-v4_7_2-macosx-intel32.pkg' + pkg 'gambc-v4_7_2-macosx-intel32.pkg' else url 'http://www.iro.umontreal.ca/~gambit/download/gambit/v4.7/prebuilt/gambc-v4_7_2-macosx-intel64.dmg' sha256 '2be0b846bb469fad9c4501efa3d34ed7aab6cc2d2fdc5acbe4eb39c4dc39b4bd' - install 'gambc-v4_7_2-macosx-intel64.pkg' + pkg 'gambc-v4_7_2-macosx-intel64.pkg' end homepage 'http://gambitscheme.org/wiki/index.php/Main_Page' version '4.7.2' diff --git a/Casks/garmin-ant-agent.rb b/Casks/garmin-ant-agent.rb index f3b0355bc4ec5..3b7b459869155 100644 --- a/Casks/garmin-ant-agent.rb +++ b/Casks/garmin-ant-agent.rb @@ -5,7 +5,7 @@ class GarminAntAgent < Cask url 'http://download.garmin.com/software/ANTAgentforMac_222.dmg' homepage 'http://www8.garmin.com/support/download_details.jsp?id=4417' - install 'Install Garmin ANT Agent.pkg' + pkg 'Install Garmin ANT Agent.pkg' uninstall :quit => 'com.garmin.AntAgent', :pkgutil => 'com.garmin.garminANTAgent.pkg' end diff --git a/Casks/garmin-communicator.rb b/Casks/garmin-communicator.rb index 5efd4ab6493f6..e6f17bd553dda 100644 --- a/Casks/garmin-communicator.rb +++ b/Casks/garmin-communicator.rb @@ -5,6 +5,6 @@ class GarminCommunicator < Cask url 'http://download.garmin.com/software/CommunicatorPluginforMac_420.dmg' homepage 'http://www8.garmin.com/support/download_details.jsp?id=3739' - install 'Install Communicator Plugin.pkg' + pkg 'Install Communicator Plugin.pkg' uninstall :pkgutil => 'com.garmin.garminGpsControl.pkg' end diff --git a/Casks/garmin-express.rb b/Casks/garmin-express.rb index 83efeb8b60660..2b48bd8082661 100644 --- a/Casks/garmin-express.rb +++ b/Casks/garmin-express.rb @@ -5,6 +5,6 @@ class GarminExpress < Cask url 'http://download.garmin.com/omt/express/GarminExpress.dmg' homepage 'http://www.garmin.com/express' - install 'Install Garmin Express.pkg' + pkg 'Install Garmin Express.pkg' uninstall :pkgutil => 'com.garmin.renu.client' end diff --git a/Casks/garmin-training-center.rb b/Casks/garmin-training-center.rb index 2173fef0a98da..8258750124ee7 100644 --- a/Casks/garmin-training-center.rb +++ b/Casks/garmin-training-center.rb @@ -5,6 +5,6 @@ class GarminTrainingCenter < Cask url 'https://www8.garmin.com/software/TrainingCenterforMac_321.dmg' homepage 'http://www.garmin.com/garmin/cms/intosports/training_center' - install 'Garmin Training Center.pkg' + pkg 'Garmin Training Center.pkg' uninstall :pkgutil => 'com.garmin.garminTrainingCenter.*pkg' end diff --git a/Casks/gdal-framework.rb b/Casks/gdal-framework.rb index d79ee939a9af2..ea9a428ec7bb5 100644 --- a/Casks/gdal-framework.rb +++ b/Casks/gdal-framework.rb @@ -3,8 +3,8 @@ class GdalFramework < Cask homepage 'http://www.kyngchaos.com/software/frameworks' version '1.11' sha256 '8611b80e9e0f2a1ef87ff11429418fbf5996efc6a8041a3e096c3408dcceaf14' - install 'GDAL Complete.pkg' - install 'Numpy.pkg' + pkg 'GDAL Complete.pkg' + pkg 'Numpy.pkg' uninstall :pkgutil => [ 'org.maptools.proj-framework-snow', 'org.sqlite.sqlite3b-framework-snow', diff --git a/Casks/glimmerblocker.rb b/Casks/glimmerblocker.rb index 5f3ec2ead97a9..aa85dbaf74b01 100644 --- a/Casks/glimmerblocker.rb +++ b/Casks/glimmerblocker.rb @@ -5,6 +5,6 @@ class Glimmerblocker < Cask url 'http://glimmerblocker.org/downloads/GlimmerBlocker-1.5.3.dmg' homepage 'http://glimmerblocker.org' - install 'GlimmerBlocker.pkg' + pkg 'GlimmerBlocker.pkg' uninstall :pkgutil => 'org.glimmerblocker.pkg' end diff --git a/Casks/google-adwords-editor.rb b/Casks/google-adwords-editor.rb index 7e1db626c7b58..dae733ab79b30 100644 --- a/Casks/google-adwords-editor.rb +++ b/Casks/google-adwords-editor.rb @@ -5,6 +5,6 @@ class GoogleAdwordsEditor < Cask url 'https://dl.google.com/adwords_editor/10.4.1/mac/en-US/AdWords-Editor-10.4.1-en-US.dmg' homepage 'http://www.google.com/intl/en_US/adwordseditor/' - install 'AdWords-Editor-10.4.1-en-US.pkg' + pkg 'AdWords-Editor-10.4.1-en-US.pkg' uninstall :pkgutil => 'com.google.adwordseditor.pkg' end diff --git a/Casks/google-hangouts.rb b/Casks/google-hangouts.rb index 32b7b28e5d70a..33ed30994c198 100644 --- a/Casks/google-hangouts.rb +++ b/Casks/google-hangouts.rb @@ -5,6 +5,6 @@ class GoogleHangouts < Cask url 'https://dl.google.com/googletalk/googletalkplugin/GoogleVoiceAndVideoSetup.dmg' homepage 'https://www.google.com/tools/dlpage/hangoutplugin' - install 'Google Voice and Video.pkg' + pkg 'Google Voice and Video.pkg' uninstall :pkgutil => 'com.google.pkg.GoogleVoiceAndVideo' end diff --git a/Casks/google-japanese-ime.rb b/Casks/google-japanese-ime.rb index 1019c6fe9cc0d..0393c2cdef323 100644 --- a/Casks/google-japanese-ime.rb +++ b/Casks/google-japanese-ime.rb @@ -5,7 +5,7 @@ class GoogleJapaneseIme < Cask url 'https://dl.google.com/japanese-ime/latest/GoogleJapaneseInput.dmg' homepage 'https://www.google.co.jp/ime/' - install 'GoogleJapaneseInput.pkg' + pkg 'GoogleJapaneseInput.pkg' uninstall :pkgutil => 'com.google.pkg.GoogleJapaneseInput', :launchctl => [ 'com.google.inputmethod.Japanese.Converter', diff --git a/Casks/gpgtools.rb b/Casks/gpgtools.rb index 544907fa90b0a..78876cd443b02 100644 --- a/Casks/gpgtools.rb +++ b/Casks/gpgtools.rb @@ -5,7 +5,7 @@ class Gpgtools < Cask url 'https://releases.gpgtools.org/GPG%20Suite%20-%202013.10.22.dmg' homepage 'https://gpgtools.org/index.html' - install 'Install.pkg' + pkg 'Install.pkg' postflight do system '/usr/bin/sudo', '-E', '--', '/usr/local/MacGPG2/libexec/fixGpgHome', Etc.getpwuid(Process.euid).name, diff --git a/Casks/graphviz.rb b/Casks/graphviz.rb index 5f9992feb5f62..f5736a1d0baba 100644 --- a/Casks/graphviz.rb +++ b/Casks/graphviz.rb @@ -5,6 +5,6 @@ class Graphviz < Cask url "http://www.graphviz.org/pub/graphviz/stable/macos/mountainlion/graphviz-#{version}.pkg" homepage 'http://www.graphviz.org/' - install "graphviz-#{version}.pkg" + pkg "graphviz-#{version}.pkg" uninstall :pkgutil => 'com.att.graphviz.*' end diff --git a/Casks/growl-fork.rb b/Casks/growl-fork.rb index 353af21db1d04..a61d1570bba52 100644 --- a/Casks/growl-fork.rb +++ b/Casks/growl-fork.rb @@ -5,6 +5,6 @@ class GrowlFork < Cask url 'https://www.macupdate.com/download/41038/Growl-1.2.2f1.dmg' homepage 'https://www.macupdate.com/app/mac/41038/growl-fork' - install 'Growl.pkg' + pkg 'Growl.pkg' uninstall :files => '/Library/PreferencePanes/Growl.prefPane' end diff --git a/Casks/growlnotify.rb b/Casks/growlnotify.rb index e03255358d0bb..1f2149788c8b5 100644 --- a/Casks/growlnotify.rb +++ b/Casks/growlnotify.rb @@ -5,6 +5,6 @@ class Growlnotify < Cask url 'https://growl.cachefly.net/GrowlNotify-2.1.zip' homepage 'http://growl.info/downloads' - install 'GrowlNotify.pkg' + pkg 'GrowlNotify.pkg' uninstall :pkgutil => 'info.growl.growlnotify.*pkg' end diff --git a/Casks/hall.rb b/Casks/hall.rb index 990f88dd4fe9c..bce17d585e7e0 100644 --- a/Casks/hall.rb +++ b/Casks/hall.rb @@ -5,6 +5,6 @@ class Hall < Cask url 'https://hall.com/desktop/osx/installers/Hall_1_0_5.dmg' homepage 'https://hall.com/download-hall/hall-for-mac' - install 'Hall.pkg' + pkg 'Hall.pkg' uninstall :pkgutil => 'com.companyline.hall.desktop', :files => '/Applications/Hall.app' end diff --git a/Casks/haskell-platform.rb b/Casks/haskell-platform.rb index c0ecbbbb96322..caee132bcb658 100644 --- a/Casks/haskell-platform.rb +++ b/Casks/haskell-platform.rb @@ -5,6 +5,6 @@ class HaskellPlatform < Cask url 'http://www.haskell.org/platform/download/2014.2.0.0/Haskell%20Platform%202014.2.0.0%2064bit.signed.pkg' homepage 'http://www.haskell.org/platform/' - install 'Haskell Platform 2014.2.0.0 64bit.signed.pkg' + pkg 'Haskell Platform 2014.2.0.0 64bit.signed.pkg' uninstall :script => { :executable => '/usr/bin/uninstall-hs', :args => %w[all --remove] } end diff --git a/Casks/heroku-toolbelt.rb b/Casks/heroku-toolbelt.rb index ce49536d182d9..b5d9964af88ec 100644 --- a/Casks/heroku-toolbelt.rb +++ b/Casks/heroku-toolbelt.rb @@ -5,7 +5,7 @@ class HerokuToolbelt < Cask url 'http://assets.heroku.com/heroku-toolbelt/heroku-toolbelt.pkg' homepage 'https://toolbelt.heroku.com/' - install 'heroku-toolbelt.pkg' + pkg 'heroku-toolbelt.pkg' uninstall :pkgutil => 'com.heroku.toolbelt', :files => [ '/usr/local/heroku', diff --git a/Casks/horndis.rb b/Casks/horndis.rb index c7a602067233d..dcb13ed883b57 100644 --- a/Casks/horndis.rb +++ b/Casks/horndis.rb @@ -5,7 +5,7 @@ class Horndis < Cask url 'http://joshuawise.com/downloads/HoRNDIS-rel5.pkg' homepage 'http://joshuawise.com/horndis' - install 'HoRNDIS-rel5.pkg' + pkg 'HoRNDIS-rel5.pkg' uninstall :kext => 'com.joshuawise.kexts.HoRNDIS', :pkgutil => 'com.joshuawise.*' end diff --git a/Casks/hoster.rb b/Casks/hoster.rb index 928510b16386c..ab9ebec9a85d1 100644 --- a/Casks/hoster.rb +++ b/Casks/hoster.rb @@ -6,6 +6,6 @@ class Hoster < Cask appcast 'http://www.redwinder.com/macapp/hoster/hoster12.xml' homepage 'http://www.redwinder.com/macapp/hoster/' - install 'Hoster1.208.mpkg', :allow_untrusted => true + pkg 'Hoster1.208.mpkg', :allow_untrusted => true uninstall :pkgutil => 'com.redwinder.hoster.hoster.pkg' end diff --git a/Casks/hosts.rb b/Casks/hosts.rb index c26a27bdbbd67..6259dbb0c520e 100644 --- a/Casks/hosts.rb +++ b/Casks/hosts.rb @@ -5,6 +5,6 @@ class Hosts < Cask url "https://github.com/downloads/specialunderwear/Hosts.prefpane/Hosts-#{version}.pkg" homepage 'http://permanentmarkers.nl/software.html' - install "Hosts-#{version}.pkg" + pkg "Hosts-#{version}.pkg" uninstall :pkgutil => 'nl.permanentmarkers.hosts.Hosts.pkg' end diff --git a/Casks/hubic.rb b/Casks/hubic.rb index 40fa236e77103..f66fecbe065bf 100644 --- a/Casks/hubic.rb +++ b/Casks/hubic.rb @@ -5,6 +5,6 @@ class Hubic < Cask url 'http://mir7.ovh.net/ovh-applications/hubic/hubiC-OSX/0.2.5/hubiC-OSX-0.2.5.224-osx.pkg' homepage 'https://hubic.com' - install 'hubiC-OSX-0.2.5.224-osx.pkg' + pkg 'hubiC-OSX-0.2.5.224-osx.pkg' uninstall :pkgutil => 'com.ovh.hubicmac' end diff --git a/Casks/idris.rb b/Casks/idris.rb index 03f16d4ab2995..d84d4b0516627 100644 --- a/Casks/idris.rb +++ b/Casks/idris.rb @@ -5,6 +5,6 @@ class Idris < Cask url 'http://www.idris-lang.org/pkgs/idris-current.pkg' homepage 'http://www.idris-lang.org' - install 'idris-current.pkg' + pkg 'idris-current.pkg' uninstall :pkgutil => 'org.idris-lang' end diff --git a/Casks/indigo.rb b/Casks/indigo.rb index 57a5ca09054e9..28f1aa33c55d5 100644 --- a/Casks/indigo.rb +++ b/Casks/indigo.rb @@ -5,7 +5,7 @@ class Indigo < Cask url 'http://cloud.goprism.com/download/Indigo.dmg' homepage 'http://www.perceptiveautomation.com/indigo/index.html' - install 'Indigo Installer.pkg' + pkg 'Indigo Installer.pkg' uninstall :kext => 'com.perceptiveautomation.indigo_overrides.kext', :pkgutil => 'com.perceptiveautomation.pkg.*' end diff --git a/Casks/injection.rb b/Casks/injection.rb index 5ba38bc5a24b6..5aca067231dc6 100644 --- a/Casks/injection.rb +++ b/Casks/injection.rb @@ -5,7 +5,7 @@ class Injection < Cask url 'http://injectionforxcode.johnholdsworth.com/InjectionPluginV5.1.pkg' homepage 'http://injectionforxcode.com/' - install 'InjectionPluginV5.1.pkg' + pkg 'InjectionPluginV5.1.pkg' uninstall :pkgutil => 'com.injectionforxcode.injectionPluginForXcode.InjectionPlugin.pkg', :quit => 'com.johnholdsworth.InjectionPluginIII', :files => '/Users/beng/Library/Application Support/Developer/Shared/Xcode/Plug-ins/InjectionPlugin.xcplugin' diff --git a/Casks/intel-haxm.rb b/Casks/intel-haxm.rb index a479314b3ba6a..52927b9caae74 100644 --- a/Casks/intel-haxm.rb +++ b/Casks/intel-haxm.rb @@ -6,6 +6,6 @@ class IntelHaxm < Cask homepage 'https://software.intel.com/en-us/android/articles/intel-hardware-accelerated-execution-manager' nested_container "haxm-macosx_r04/IntelHAXM_#{version}.dmg" - install "IntelHAXM_#{version}.mpkg" + 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 index 0e78f409f6a42..1645fd9d03331 100644 --- a/Casks/intel-power-gadget.rb +++ b/Casks/intel-power-gadget.rb @@ -8,6 +8,6 @@ class IntelPowerGadget < Cask # this bogus-looking character accurately reflects an upstream error nested_container 'IntelÆ Power Gadget.dmg' - install 'Install Intel Power Gadget.pkg' + pkg 'Install Intel Power Gadget.pkg' uninstall :pkgutil => 'com.intel.pkg.PowerGadget.*' end diff --git a/Casks/intel-xdk.rb b/Casks/intel-xdk.rb index 2a19bea64ed72..5260fcab87f3c 100644 --- a/Casks/intel-xdk.rb +++ b/Casks/intel-xdk.rb @@ -5,6 +5,6 @@ class IntelXdk < Cask url 'https://d2bnc8freht07j.cloudfront.net/xdk_web_mac_master_0769.dmg' homepage 'http://xdk-software.intel.com/' - install 'xdk_full_0769.pkg' + pkg 'xdk_full_0769.pkg' uninstall :pkgutil => 'com.intel.pkg.xdk_new' end diff --git a/Casks/iphone-configuration-utility.rb b/Casks/iphone-configuration-utility.rb index 0b09c393b37ff..14bdff214f0ea 100644 --- a/Casks/iphone-configuration-utility.rb +++ b/Casks/iphone-configuration-utility.rb @@ -5,7 +5,7 @@ class IphoneConfigurationUtility < Cask url 'https://support.apple.com/downloads/DL1465/en_US/iPhoneConfigUtility.dmg' homepage 'http://support.apple.com/kb/DL1465' - install 'iPhoneConfigurationUtility.pkg' + pkg 'iPhoneConfigurationUtility.pkg' # note - do not uninstall via :pkgutil, as system files would be deleted uninstall :files => '/Applications/Utilities/iPhone Configuration Utility.app' end diff --git a/Casks/istat-server.rb b/Casks/istat-server.rb index 9d6f0020ac3f8..f4cde7b4e922c 100644 --- a/Casks/istat-server.rb +++ b/Casks/istat-server.rb @@ -5,7 +5,7 @@ class IstatServer < Cask url 'http://download.bjango.com/istatserver/' homepage 'http://bjango.com/mac/istatserver/' - install 'iStat Server.pkg' + pkg 'iStat Server.pkg' uninstall :script => '/Applications/iStat Server.app/Contents/Resources/Uninstaller', :pkgutil => 'com.bjango.istatserver.*' caveats do diff --git a/Casks/java.rb b/Casks/java.rb index a810dc2e6bd9e..7e0ec0af86d5d 100644 --- a/Casks/java.rb +++ b/Casks/java.rb @@ -8,7 +8,7 @@ class Java < Cask } homepage 'http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html' - install 'JDK 8 Update 20.pkg' + pkg 'JDK 8 Update 20.pkg' postflight do system '/usr/bin/sudo', '-E', '--', '/usr/libexec/PlistBuddy', '-c', 'Add :JavaVM:JVMCapabilities: string BundledApp', "/Library/Java/JavaVirtualMachines/jdk#{version}.jdk/Contents/Info.plist" diff --git a/Casks/jawbone-updater.rb b/Casks/jawbone-updater.rb index a2078bf4e3935..9466f9d9aed35 100644 --- a/Casks/jawbone-updater.rb +++ b/Casks/jawbone-updater.rb @@ -5,7 +5,7 @@ class JawboneUpdater < Cask url 'http://content.jawbone.com/store/dashboard/Jawbone_Updater-2.2.3.pkg' homepage 'http://jawbone.com/' - install 'Jawbone_Updater-2.2.3.pkg' + pkg 'Jawbone_Updater-2.2.3.pkg' uninstall :quit => 'com.aliph.Jawbone_Updater', :pkgutil => 'com.Aliph.[Jj]awbone(|Updater.*).pkg' end diff --git a/Casks/karabiner.rb b/Casks/karabiner.rb index 50aef0e4135d1..61d4f6081df79 100644 --- a/Casks/karabiner.rb +++ b/Casks/karabiner.rb @@ -5,7 +5,7 @@ class Karabiner < Cask url "https://pqrs.org/osx/karabiner/files/Karabiner-#{version}.dmg" homepage 'https://pqrs.org/osx/karabiner/' - install 'Karabiner.pkg' + pkg 'Karabiner.pkg' binary '/Applications/Karabiner.app/Contents/Library/vendor/bin/blueutil' binary '/Applications/Karabiner.app/Contents/Library/utilities/bin/warp-mouse-cursor-position' uninstall :quit => 'org.pqrs.Karabiner', diff --git a/Casks/kensington-trackball-works.rb b/Casks/kensington-trackball-works.rb index 19092a6e94fb5..f6d74e980ccd3 100644 --- a/Casks/kensington-trackball-works.rb +++ b/Casks/kensington-trackball-works.rb @@ -5,7 +5,7 @@ class KensingtonTrackballWorks < Cask url 'http://accoblobstorageus.blob.core.windows.net/software/38c5e777-b2ef-4434-8091-6290cb41fc16.dmg' homepage 'http://www.kensington.com/' - install 'Kensington TrackballWorks.pkg' + pkg 'Kensington TrackballWorks.pkg' uninstall :pkgutil => 'com.kensington.trackballworks.driver.installer', :kext => 'com.kensington.trackballworks.driver', :launchctl => [ diff --git a/Casks/klayout.rb b/Casks/klayout.rb index cc20f67bc5073..c6cc046f3256b 100644 --- a/Casks/klayout.rb +++ b/Casks/klayout.rb @@ -5,7 +5,7 @@ class Klayout < Cask url 'http://178.77.72.242/downloads/klayout.0.23.2.pkg' homepage 'http://www.klayout.de/index.html' - install 'klayout.0.23.2.pkg' + pkg 'klayout.0.23.2.pkg' uninstall :pkgutil => 'klayout.de', :quit => 'klayout.de' end diff --git a/Casks/ksdiff.rb b/Casks/ksdiff.rb index abe277f621dc6..584af70e4b39f 100644 --- a/Casks/ksdiff.rb +++ b/Casks/ksdiff.rb @@ -5,7 +5,7 @@ class Ksdiff < Cask url 'http://cdn.kaleidoscopeapp.com/releases/ksdiff-122.zip' homepage 'http://www.kaleidoscopeapp.com/ksdiff2' - install 'Install ksdiff.pkg' + pkg 'Install ksdiff.pkg' uninstall :pkgutil => 'com.blackpixel.kaleidoscope.ksdiff.installer.pkg' # todo: conflicts_with_cask kaleidoscope caveats <<-EOS.undent diff --git a/Casks/lastpass-universal.rb b/Casks/lastpass-universal.rb index d4937dcadcd2a..c959427364c2c 100644 --- a/Casks/lastpass-universal.rb +++ b/Casks/lastpass-universal.rb @@ -5,6 +5,6 @@ class LastpassUniversal < Cask url 'https://lastpass.com/lpmacosx.dmg' homepage 'https://lastpass.com/' - install 'lpmacosx.pkg' + pkg 'lpmacosx.pkg' uninstall :pkgutil => 'com.lastpass.lpmacosx' end diff --git a/Casks/lazarus.rb b/Casks/lazarus.rb index 309987478bcd0..334a89e2cdea6 100644 --- a/Casks/lazarus.rb +++ b/Casks/lazarus.rb @@ -5,6 +5,6 @@ class Lazarus < Cask url 'https://downloads.sourceforge.net/lazarus/lazarus-1.0.14-20131116-i386-macosx.dmg' homepage 'http://lazarus.freepascal.org/' - install 'lazarus.pkg' + pkg 'lazarus.pkg' uninstall :pkgutil => 'org.freepascal.lazarus.www' end diff --git a/Casks/leap-motion.rb b/Casks/leap-motion.rb index e060fbe176df8..5fcfd85d827cf 100644 --- a/Casks/leap-motion.rb +++ b/Casks/leap-motion.rb @@ -5,6 +5,6 @@ class LeapMotion < Cask url 'https://warehouse.leapmotion.com/apps/3382/download' homepage 'https://www.leapmotion.com/setup' - install 'Leap Motion.pkg' + pkg 'Leap Motion.pkg' uninstall :script => '/Applications/Leap Motion.app/Contents/MacOS/uninstall' end diff --git a/Casks/logic.rb b/Casks/logic.rb index 2995a381c799c..47c920fe4d1c6 100644 --- a/Casks/logic.rb +++ b/Casks/logic.rb @@ -5,6 +5,6 @@ class Logic < Cask url 'http://downloads.saleae.com/Logic%201.1.15%20(10.5%2B).pkg' homepage 'http://www.saleae.com/' - install 'Logic 1.1.15 (10.5+).pkg' + pkg 'Logic 1.1.15 (10.5+).pkg' uninstall :pkgutil => 'com.saleae.saleae.Logic.pkg' end diff --git a/Casks/logitech-control-center.rb b/Casks/logitech-control-center.rb index 3c299e7d800c3..d86ec621a33ac 100644 --- a/Casks/logitech-control-center.rb +++ b/Casks/logitech-control-center.rb @@ -5,6 +5,6 @@ class LogitechControlCenter < Cask url 'http://www.logitech.com/pub/techsupport/mouse/mac/lcc3.9.0.60.zip' homepage 'http://www.logitech.com' - install 'LCC Installer.app/Contents/Resources/Logitech Control Center.mpkg' + pkg 'LCC Installer.app/Contents/Resources/Logitech Control Center.mpkg' uninstall :script => 'LCC Installer.app/Contents/Resources/LCC Uninstaller Tool' end diff --git a/Casks/logitech-gaming-software.rb b/Casks/logitech-gaming-software.rb index 774c07a50e83f..ad52cf567e2b9 100644 --- a/Casks/logitech-gaming-software.rb +++ b/Casks/logitech-gaming-software.rb @@ -5,7 +5,7 @@ class LogitechGamingSoftware < Cask url 'http://logitech-viva.navisite.net/web/ftp/pub/techsupport/gaming/LogitechSetup_8.50.133.dmg' homepage 'http://www.logitech.com/en-us/support/gaming-software?section=downloads&bit=&osid=36' - install 'LogiGamingSetup.mpkg' + pkg 'LogiGamingSetup.mpkg' uninstall :script => '/Applications/Logitech/Uninstaller.app/Contents/Resources/UninstallScript.sh' caveats do reboot diff --git a/Casks/logitech-harmony.rb b/Casks/logitech-harmony.rb index ee9927fb89671..d5db17e8d8bc1 100644 --- a/Casks/logitech-harmony.rb +++ b/Casks/logitech-harmony.rb @@ -5,7 +5,7 @@ class LogitechHarmony < Cask url 'http://logitech-sjca.navisite.net/web/ftp/pub/techsupport/harmony/LogitechHarmonyRemoteSoftware7.8.1-OSX.dmg' homepage 'http://www.logitech.com/en-us/support/universal-remotes' - install 'LogitechRemoteSoftware.pkg' + pkg 'LogitechRemoteSoftware.pkg' uninstall :quit => 'com.logitech.harmony.cappuccino.client.logitech', :kext => [ 'com.RemoteControl.USBLAN.usbpart', diff --git a/Casks/logitech-myharmony.rb b/Casks/logitech-myharmony.rb index 08fc58977557b..65e768eccd815 100644 --- a/Casks/logitech-myharmony.rb +++ b/Casks/logitech-myharmony.rb @@ -5,7 +5,7 @@ class LogitechMyharmony < Cask url 'http://app.myharmony.com/prod/mac/1.0/MyHarmony-App.dmg' homepage 'https://setup.myharmony.com/' - install 'MyHarmonySetup.pkg' + pkg 'MyHarmonySetup.pkg' uninstall :quit => 'org.logitech.MyHarmony', :pkgutil => 'MyHarmony.pkg' end diff --git a/Casks/logitech-unifying.rb b/Casks/logitech-unifying.rb index faf1a7c9606a6..4f461333af3a0 100644 --- a/Casks/logitech-unifying.rb +++ b/Casks/logitech-unifying.rb @@ -5,6 +5,6 @@ class LogitechUnifying < Cask url 'http://www.logitech.com/pub/controldevices/unifying/unifying1.10.421.dmg' homepage 'http://www.logitech.com/en-us/promotions/6072' - install 'Logitech Unifying Software.mpkg' + pkg 'Logitech Unifying Software.mpkg' uninstall :pkgutil => 'com.Logitech.*pkg' end diff --git a/Casks/macports.rb b/Casks/macports.rb index fad1c55352d78..2eb6ec2a93b69 100644 --- a/Casks/macports.rb +++ b/Casks/macports.rb @@ -2,11 +2,11 @@ class Macports < Cask if MacOS.version < :mavericks url 'https://distfiles.macports.org/MacPorts/MacPorts-2.2.1-10.8-MountainLion.pkg' sha256 'd10bf4a27f89709501e1370d7d80f415eaf16bae23fd9ff3d4e96f86afdf8cd6' - install 'MacPorts-2.2.1-10.8-MountainLion.pkg' + pkg 'MacPorts-2.2.1-10.8-MountainLion.pkg' else url 'https://distfiles.macports.org/MacPorts/MacPorts-2.2.1-10.9-Mavericks.pkg' sha256 '2df01bf88e1e3de32ada0f42a8a46fb992093baee62f9d911fa3ae3ee895d471' - install 'MacPorts-2.2.1-10.9-Mavericks.pkg' + pkg 'MacPorts-2.2.1-10.9-Mavericks.pkg' end homepage 'http://www.macports.org' version '2.2.1' diff --git a/Casks/mactex.rb b/Casks/mactex.rb index 0de2055c4bdc0..ed00f004ade97 100644 --- a/Casks/mactex.rb +++ b/Casks/mactex.rb @@ -5,7 +5,7 @@ class Mactex < Cask url 'http://mirror.ctan.org/systems/mac/mactex/mactex-20140525.pkg' homepage 'http://www.tug.org/mactex/' - install 'mactex-20140525.pkg' + pkg 'mactex-20140525.pkg' uninstall :pkgutil => [ 'org.tug.mactex.ghostscript9.10', 'org.tug.mactex.gui2014', diff --git a/Casks/magican.rb b/Casks/magican.rb index 146099ffa3b08..f7852fffe7227 100644 --- a/Casks/magican.rb +++ b/Casks/magican.rb @@ -5,6 +5,6 @@ class Magican < Cask url 'http://www.magicansoft.com/download/Magican.pkg' homepage 'http://www.magicansoft.com/' - install 'Magican.pkg' + pkg 'Magican.pkg' uninstall :pkgutil => 'com.magican.*' end diff --git a/Casks/mailfollowup.rb b/Casks/mailfollowup.rb index 8fe6e10fb375b..1d29cea8d811e 100644 --- a/Casks/mailfollowup.rb +++ b/Casks/mailfollowup.rb @@ -6,7 +6,7 @@ class Mailfollowup < Cask homepage 'http://www.cs.unc.edu/~welch/MailFollowup/' nested_container 'MailFollowUp_1.6.2.dmg' - install 'Install MailFollowUp.pkg' + pkg 'Install MailFollowUp.pkg' uninstall :quit => 'com.apple.mail', :files => [ diff --git a/Casks/makerware.rb b/Casks/makerware.rb index bc691abacb2fb..dc02cdaed82c5 100644 --- a/Casks/makerware.rb +++ b/Casks/makerware.rb @@ -5,6 +5,6 @@ class Makerware < Cask url 'https://s3.amazonaws.com/downloads.makerbot.com/makerware/MakerWare%20Bundle%20of%20Awesome%202.4.1.35.dmg' homepage 'http://www.makerbot.com/makerware/' - install 'MakerWare Bundle of Awesome 2.4.1.35.pkg' + pkg 'MakerWare Bundle of Awesome 2.4.1.35.pkg' uninstall :pkgutil => 'com.makerbot.*' end diff --git a/Casks/mamp.rb b/Casks/mamp.rb index be8e2f32597a4..beee08d7738d1 100644 --- a/Casks/mamp.rb +++ b/Casks/mamp.rb @@ -5,7 +5,7 @@ class Mamp < Cask url 'http://downloads9.mamp.info/MAMP-PRO/releases/3.0.6/MAMP_MAMP_PRO_3.0.6.pkg' homepage 'http://www.mamp.info/en/index.html' - install 'MAMP_MAMP_PRO_3.0.6.pkg' + pkg 'MAMP_MAMP_PRO_3.0.6.pkg' postflight do system '/usr/bin/sudo', '-E', '--', '/usr/sbin/chown', '-R', '--', "#{Etc.getpwuid(Process.euid).name}:staff", '/Applications/MAMP', '/Applications/MAMP PRO' diff --git a/Casks/matplotlib.rb b/Casks/matplotlib.rb index b47c57021b3fe..a6849c3094b60 100644 --- a/Casks/matplotlib.rb +++ b/Casks/matplotlib.rb @@ -4,6 +4,6 @@ class Matplotlib < Cask url 'http://www.kyngchaos.com/files/software/python/matplotlib-1.3.1-2.dmg' homepage 'http://www.kyngchaos.com/software/python' - install 'matplotlib.pkg' + pkg 'matplotlib.pkg' uninstall :pkgutil => 'com.kyngchaos.matplotib-lion' end diff --git a/Casks/mcs783x.rb b/Casks/mcs783x.rb index f4e1624a3f19f..981b0691d1d73 100644 --- a/Casks/mcs783x.rb +++ b/Casks/mcs783x.rb @@ -8,7 +8,7 @@ class Mcs783x < Cask sha256 'ea1d6245b5accabf041060886f16cc00b43d3e6e7e032f4154b487e96ab05569' nested_container "#{basename}/MCS7830_v#{version}.dmg" - install "MCS7830 v#{version}.pkg" + pkg "MCS7830 v#{version}.pkg" uninstall :script => { :executable => 'uninstal driver' }, :pkgutil => 'asix.com.moschipUsbEthernet.pkg' end diff --git a/Casks/microsoft-intellipoint.rb b/Casks/microsoft-intellipoint.rb index 7ce5a12e7ba04..739c35712f9e2 100644 --- a/Casks/microsoft-intellipoint.rb +++ b/Casks/microsoft-intellipoint.rb @@ -5,7 +5,7 @@ class MicrosoftIntellipoint < Cask url 'http://download.microsoft.com/download/B/1/0/B109F931-70E2-425F-8681-EAAB75845AB8/Microsoft-Mouse_d305.dmg' homepage 'http://www.microsoft.com/hardware/en-us/mice' - install 'Microsoft Mouse Installer.app/Contents/Resources/Microsoft Mouse.pkg' + pkg 'Microsoft Mouse Installer.app/Contents/Resources/Microsoft Mouse.pkg' uninstall :pkgutil => 'com.microsoft.mouse.installer', :kext => [ 'com.microsoft.driver.MicrosoftMouse', diff --git a/Casks/microsoft-intellitype.rb b/Casks/microsoft-intellitype.rb index 0609dd72e9952..474a4424fe4f8 100644 --- a/Casks/microsoft-intellitype.rb +++ b/Casks/microsoft-intellitype.rb @@ -5,7 +5,7 @@ class MicrosoftIntellitype < Cask url 'http://download.microsoft.com/download/B/1/0/B109F931-70E2-425F-8681-EAAB75845AB8/Microsoft-Desktop_d305.dmg' homepage 'http://www.microsoft.com/hardware/en-us/keyboards' - install 'Microsoft Desktop Installer.app/Contents/Resources/Microsoft Desktop.mpkg/Contents/Packages/Microsoft Keyboard.pkg' + pkg 'Microsoft Desktop Installer.app/Contents/Resources/Microsoft Desktop.mpkg/Contents/Packages/Microsoft Keyboard.pkg' uninstall :pkgutil => 'com.microsoft.keyboard.installer', :kext => [ diff --git a/Casks/microsoft-lync-plugin.rb b/Casks/microsoft-lync-plugin.rb index 6a557f6ef18dd..1c47d094cdc5f 100644 --- a/Casks/microsoft-lync-plugin.rb +++ b/Casks/microsoft-lync-plugin.rb @@ -5,6 +5,6 @@ class MicrosoftLyncPlugin < Cask url 'https://lync12.lyncweb.microsoft.com//lwa/Plugins/LWAPluginInstaller.pkg' homepage 'http://office.microsoft.com/Lync' - install 'LWAPluginInstaller.pkg' + pkg 'LWAPluginInstaller.pkg' uninstall :pkgutil => 'Lync.Client.LwaPluginInstaller.*.LwaPlugin.pkg' end diff --git a/Casks/minilyrics.rb b/Casks/minilyrics.rb index 7c4fddd384307..c930ca25b751c 100644 --- a/Casks/minilyrics.rb +++ b/Casks/minilyrics.rb @@ -5,6 +5,6 @@ class Minilyrics < Cask url 'http://www.crintsoft.com/download/MiniLyrics.dmg' homepage 'http://www.crintsoft.com/' - install 'MiniLyrics.pkg' + pkg 'MiniLyrics.pkg' uninstall :pkgutil => 'com.crintsoft.MiniLyrics.pkg' end diff --git a/Casks/minimalclock.rb b/Casks/minimalclock.rb index 47c2b65590fbb..94ee307407a75 100644 --- a/Casks/minimalclock.rb +++ b/Casks/minimalclock.rb @@ -5,6 +5,6 @@ class Minimalclock < Cask url 'http://www.ilovecolorz.net/download/MinimalClockScreenSaver.dmg' homepage 'http://ilovecolorz.net/minimalclock/' - install ' .pkg' + pkg ' .pkg' uninstall :pkgutil => 'com.ilovecolorz.minimalclockScreenSaver.*' end diff --git a/Casks/mixlr.rb b/Casks/mixlr.rb index 1aaf4a1b8f99c..ac32e0205f440 100644 --- a/Casks/mixlr.rb +++ b/Casks/mixlr.rb @@ -5,6 +5,6 @@ class Mixlr < Cask url 'http://cdn.mixlr.com/Mixlr_beta_latest.pkg' homepage 'http://mixlr.com' - install 'Mixlr_beta_latest.pkg' + pkg 'Mixlr_beta_latest.pkg' uninstall :pkgutil => 'com.mixlr.Mixlr' end diff --git a/Casks/moneyplex.rb b/Casks/moneyplex.rb index 9f6a6afdb9c29..41f02082afce8 100644 --- a/Casks/moneyplex.rb +++ b/Casks/moneyplex.rb @@ -5,6 +5,6 @@ class Moneyplex < Cask url 'http://www.matrica.com/download/mac/moneyplex.dmg' homepage 'http://www.matrica.de/' - install 'moneyplex.pkg', :allow_untrusted => true + pkg 'moneyplex.pkg', :allow_untrusted => true uninstall :pkgutil => 'de.matrica.moneyplex.Moneyplex.pkg' end diff --git a/Casks/mono-mdk.rb b/Casks/mono-mdk.rb index 9569cff4bdc16..c0aa52fe26500 100644 --- a/Casks/mono-mdk.rb +++ b/Casks/mono-mdk.rb @@ -5,6 +5,6 @@ class MonoMdk < Cask url "http://download.mono-project.com/archive/#{version}/macos-10-x86/MonoFramework-MDK-#{version}.macos10.xamarin.x86.pkg" homepage 'http://mono-project.com/' - install "MonoFramework-MDK-#{version}.macos10.xamarin.x86.pkg" + pkg "MonoFramework-MDK-#{version}.macos10.xamarin.x86.pkg" uninstall :pkgutil => 'com.xamarin.mono-MDK.pkg' end diff --git a/Casks/mono-mre.rb b/Casks/mono-mre.rb index c3dabf565f708..09b802008ae57 100644 --- a/Casks/mono-mre.rb +++ b/Casks/mono-mre.rb @@ -5,6 +5,6 @@ class MonoMre < Cask url "http://download.mono-project.com/archive/#{version}/macos-10-x86/MonoFramework-MRE-#{version}.macos10.xamarin.x86.pkg" homepage 'http://mono-project.com' - install "MonoFramework-MRE-#{version}.macos10.xamarin.x86.pkg" + pkg "MonoFramework-MRE-#{version}.macos10.xamarin.x86.pkg" uninstall :pkgutil => 'com.xamarin.mono-MRE.pkg' end diff --git a/Casks/mosh.rb b/Casks/mosh.rb index 4dfdce0409ee5..c8568ccd48181 100644 --- a/Casks/mosh.rb +++ b/Casks/mosh.rb @@ -5,6 +5,6 @@ class Mosh < Cask url 'https://mosh.mit.edu/mosh-1.2.4-3.pkg' homepage 'http://mosh.mit.edu/' - install 'mosh-1.2.4-3.pkg' + pkg 'mosh-1.2.4-3.pkg' uninstall :pkgutil => 'edu.mit.mosh.mosh.pkg' end diff --git a/Casks/netbeans-cpp.rb b/Casks/netbeans-cpp.rb index a48d04b8b997c..37564dc56e4d9 100644 --- a/Casks/netbeans-cpp.rb +++ b/Casks/netbeans-cpp.rb @@ -5,7 +5,7 @@ class NetbeansCpp < Cask url 'http://download.netbeans.org/netbeans/8.0/final/bundles/netbeans-8.0-cpp-macosx.dmg' homepage 'https://netbeans.org/' - install 'NetBeans 8.0.mpkg' + pkg 'NetBeans 8.0.mpkg' uninstall :files => [ '/Applications/NetBeans' ] diff --git a/Casks/netbeans-php.rb b/Casks/netbeans-php.rb index 7199b7ce2d259..66ab1d2234e46 100644 --- a/Casks/netbeans-php.rb +++ b/Casks/netbeans-php.rb @@ -5,7 +5,7 @@ class NetbeansPhp < Cask url 'http://download.netbeans.org/netbeans/8.0/final/bundles/netbeans-8.0-php-macosx.dmg' homepage 'https://netbeans.org/' - install 'NetBeans 8.0.mpkg' + pkg 'NetBeans 8.0.mpkg' uninstall :files => [ '/Applications/NetBeans' ] diff --git a/Casks/netbeans.rb b/Casks/netbeans.rb index 9cc7566e48403..c2a2bc7f0a8b8 100644 --- a/Casks/netbeans.rb +++ b/Casks/netbeans.rb @@ -5,7 +5,7 @@ class Netbeans < Cask url 'http://download.netbeans.org/netbeans/8.0/final/bundles/netbeans-8.0-macosx.dmg' homepage 'https://netbeans.org/' - install 'NetBeans 8.0.mpkg' + pkg 'NetBeans 8.0.mpkg' # Theoretically this uninstall could conflict with a separate GlassFish # installation. # diff --git a/Casks/nike-plus-connect.rb b/Casks/nike-plus-connect.rb index aa600b8c6f317..3df2547bca48e 100644 --- a/Casks/nike-plus-connect.rb +++ b/Casks/nike-plus-connect.rb @@ -5,7 +5,7 @@ class NikePlusConnect < Cask url 'http://nikeplus.nike.com/nikeplus/nikeconnect/installers/macosx/Nike+Connect_new.dmg' homepage 'http://nikeplus.nike.com' - install 'Nike+Connect_new.pkg' + pkg 'Nike+Connect_new.pkg' uninstall :pkgutil => 'com.nike.nikeplusconnect.*' uninstall :pkgutil => 'com.nike.sportwatch' end diff --git a/Casks/nmap.rb b/Casks/nmap.rb index 28e5b87fd41f7..309498cbac399 100644 --- a/Casks/nmap.rb +++ b/Casks/nmap.rb @@ -5,6 +5,6 @@ class Nmap < Cask url "http://nmap.org/dist/nmap-#{version}.dmg" homepage 'http://nmap.org/' - install "nmap-#{version}.mpkg" + pkg "nmap-#{version}.mpkg" uninstall :pkgutil => 'org.insecure.nmap*.pkg' end diff --git a/Casks/node.rb b/Casks/node.rb index b2809d43742f9..d17f9bf3534e8 100644 --- a/Casks/node.rb +++ b/Casks/node.rb @@ -5,6 +5,6 @@ class Node < Cask url "http://nodejs.org/dist/v#{version}/node-v#{version}.pkg" homepage 'http://nodejs.org' - install "node-v#{version}.pkg" + pkg "node-v#{version}.pkg" uninstall :pkgutil => 'org.nodejs' end diff --git a/Casks/noejectdelay.rb b/Casks/noejectdelay.rb index c4543521805f3..0142fafc389d3 100644 --- a/Casks/noejectdelay.rb +++ b/Casks/noejectdelay.rb @@ -5,7 +5,7 @@ class Noejectdelay < Cask url 'https://pqrs.org/macosx/keyremap4macbook/files/NoEjectDelay-5.4.0.dmg' homepage 'https://pqrs.org/macosx/keyremap4macbook/noejectdelay.html.en' - install 'NoEjectDelay.pkg' + pkg 'NoEjectDelay.pkg' uninstall :kext => 'org.pqrs.driver.NoEjectDelay', :pkgutil => 'org.pqrs.driver.NoEjectDelay' end diff --git a/Casks/nomachine.rb b/Casks/nomachine.rb index 18a7937736936..469052e7cc741 100644 --- a/Casks/nomachine.rb +++ b/Casks/nomachine.rb @@ -5,7 +5,7 @@ class Nomachine < Cask url "http://download.nomachine.com/download/#{version.split('.')[0..1].join('.')}/MacOSX/nomachine_#{version}.dmg" homepage 'http://www.nomachine.com' - install 'NoMachine.pkg' + pkg 'NoMachine.pkg' # a launchctl job ordinarily manages uninstall once the app bundle is removed uninstall :files => '/Applications/NoMachine.app' # todo for future use when zap is documented diff --git a/Casks/nosleep.rb b/Casks/nosleep.rb index 94806cd3ad918..e0d70be8fc305 100644 --- a/Casks/nosleep.rb +++ b/Casks/nosleep.rb @@ -5,6 +5,6 @@ class Nosleep < Cask url 'https://macosx-nosleep-extension.googlecode.com/files/NoSleep-1.3.3.dmg' homepage 'https://code.google.com/p/macosx-nosleep-extension/' - install 'NoSleep.mpkg' + pkg 'NoSleep.mpkg' uninstall :script => 'Uninstall.command' end diff --git a/Casks/ntfs-free.rb b/Casks/ntfs-free.rb index ed900581f4b18..9e952ab034d7c 100644 --- a/Casks/ntfs-free.rb +++ b/Casks/ntfs-free.rb @@ -5,7 +5,7 @@ class NtfsFree < Cask url 'https://downloads.sourceforge.net/sourceforge/ntfsfree/NTFS-free-10.8.2.pkg' homepage 'http://sourceforge.net/projects/ntfsfree/' - install 'NTFS-free-10.8.2.pkg' + pkg 'NTFS-free-10.8.2.pkg' uninstall :files => [ '/System/Library/Extensions/ntfs-free.kext', '/sbin/mount_ntfs-free', diff --git a/Casks/obsidian-menu-bar-mountain-lion.rb b/Casks/obsidian-menu-bar-mountain-lion.rb index c463294c6bfac..85745d30e0191 100644 --- a/Casks/obsidian-menu-bar-mountain-lion.rb +++ b/Casks/obsidian-menu-bar-mountain-lion.rb @@ -5,6 +5,6 @@ class ObsidianMenuBarMountainLion < Cask url 'http://www.obsidianmenubar.com/downloads/Obsidian%20Menu%20Bar%2010.8.dmg' homepage 'http://www.obsidianmenubar.com' - install 'Obsidian Menu Bar.pkg' + pkg 'Obsidian Menu Bar.pkg' # uninstall :script => 'Restore OS X Menu Bar.pkg' end diff --git a/Casks/octave.rb b/Casks/octave.rb index 734b731516898..31053274dc5ba 100644 --- a/Casks/octave.rb +++ b/Casks/octave.rb @@ -5,7 +5,7 @@ class Octave < Cask url 'http://downloads.sourceforge.net/project/octave/Octave%20MacOSX%20Binary/2013-12-30%20binary%20installer%20of%20Octave%203.8.0%20for%20OSX%2010.9.1%20%28beta%29/GNU_Octave_3.8.0-6.dmg' homepage 'https://gnu.org/software/octave/' - install 'Octave-3.8.0-6.mpkg' + pkg 'Octave-3.8.0-6.mpkg' uninstall :pkgutil => [ 'org.macports.octave-next', 'org.octave.cli-app', diff --git a/Casks/onlive-client.rb b/Casks/onlive-client.rb index a96084b316b43..6677be67f81f1 100644 --- a/Casks/onlive-client.rb +++ b/Casks/onlive-client.rb @@ -5,6 +5,6 @@ class OnliveClient < Cask url 'https://games.onlive.com/client/mac.pkg' homepage 'http://games.onlive.com' - install 'mac.pkg' + pkg 'mac.pkg' uninstall :pkgutil => 'com.onlive.OnLiveClient.pkg' end diff --git a/Casks/opennx.rb b/Casks/opennx.rb index e9ebf9116667f..401a52653ec67 100644 --- a/Casks/opennx.rb +++ b/Casks/opennx.rb @@ -5,6 +5,6 @@ class Opennx < Cask url 'http://downloads.sourceforge.net/sourceforge/opennx/OpenNX-0.16.0.729.dmg' homepage 'http://opennx.net/' - install 'OpenNX.pkg' + pkg 'OpenNX.pkg' uninstall :script => { :executable => '/Library/OpenNX/bin/macuninstall', :args => ['--batch'] } end diff --git a/Casks/ormr.rb b/Casks/ormr.rb index 2a0cbd22587a3..49ec1735028b2 100644 --- a/Casks/ormr.rb +++ b/Casks/ormr.rb @@ -5,6 +5,6 @@ class Ormr < Cask url 'http://getormr.com/dn/Ormr.pkg' homepage 'http://getormr.com/home/' - install 'Ormr.pkg' + pkg 'Ormr.pkg' uninstall :pkgutil => 'com.sadcatsoft.ormr.Ormr.pkg' end diff --git a/Casks/osxfuse.rb b/Casks/osxfuse.rb index 146f4d043cb84..9f12d20e033c7 100644 --- a/Casks/osxfuse.rb +++ b/Casks/osxfuse.rb @@ -5,7 +5,7 @@ class Osxfuse < Cask url "https://downloads.sourceforge.net/project/osxfuse/osxfuse-#{version}/osxfuse-#{version}.dmg" homepage 'https://osxfuse.github.io/' - install "Install OSXFUSE #{version[0..-3]}.pkg" + pkg "Install OSXFUSE #{version[0..-3]}.pkg" uninstall :pkgutil => 'com.github.osxfuse.pkg.Core|com.github.osxfuse.pkg.PrefPane', :kext => 'com.github.osxfuse.filesystems.osxfusefs' end diff --git a/Casks/pagico.rb b/Casks/pagico.rb index 426421d3ba046..c370a50d14658 100644 --- a/Casks/pagico.rb +++ b/Casks/pagico.rb @@ -5,7 +5,7 @@ class Pagico < Cask url 'http://pagico.com/downloads/Pagico_Desktop_r1549.dmg' homepage 'http://pagico.com/' - install 'Install Pagico 6.pkg' + pkg 'Install Pagico 6.pkg' uninstall :pkgutil => 'com.pagico.*', :files => '/Applications/Pagico' end diff --git a/Casks/pandoc.rb b/Casks/pandoc.rb index 2e18153b6598c..c1f08b5781cf2 100644 --- a/Casks/pandoc.rb +++ b/Casks/pandoc.rb @@ -5,7 +5,7 @@ class Pandoc < Cask url "https://github.com/jgm/pandoc/releases/download/#{version}/pandoc-#{version}-osx.pkg" homepage 'http://johnmacfarlane.net/pandoc' - install "pandoc-#{version}-osx.pkg" + pkg "pandoc-#{version}-osx.pkg" uninstall :pkgutil => 'net.johnmacfarlane.pandoc' caveats do puts <<-EOS.undent diff --git a/Casks/paragon-extfs.rb b/Casks/paragon-extfs.rb index 91b8e1730fd99..ff6feb87946ab 100644 --- a/Casks/paragon-extfs.rb +++ b/Casks/paragon-extfs.rb @@ -5,5 +5,5 @@ class ParagonExtfs < Cask url 'http://dl.paragon-software.com/demo/extmac_trial_u.dmg' homepage 'http://www.paragon-software.com/home/extfs-mac/' - install 'FSInstaller.app/Contents/Resources/Paragon ExtFS for Mac OS X.pkg' + pkg 'FSInstaller.app/Contents/Resources/Paragon ExtFS for Mac OS X.pkg' end diff --git a/Casks/paragon-ntfs.rb b/Casks/paragon-ntfs.rb index 2504b343d9937..54948809af59c 100644 --- a/Casks/paragon-ntfs.rb +++ b/Casks/paragon-ntfs.rb @@ -5,5 +5,5 @@ class ParagonNtfs < Cask url 'http://dl.paragon-software.com/demo/ntfsmac_trial_u.dmg' homepage 'http://www.paragon-software.com/home/ntfs-mac/' - install 'FSInstaller.app/Contents/Resources/Paragon NTFS for Mac OS X.pkg' + pkg 'FSInstaller.app/Contents/Resources/Paragon NTFS for Mac OS X.pkg' end diff --git a/Casks/parallels.rb b/Casks/parallels.rb index 8913aaa46f7be..a918a38b3a75c 100644 --- a/Casks/parallels.rb +++ b/Casks/parallels.rb @@ -5,7 +5,7 @@ class Parallels < Cask url 'http://download.parallels.com/desktop/v9/update2.hotfix2/ParallelsDesktop-9.0.24237.1028877.dmg' homepage 'http://www.parallels.com/products/desktop/' - install 'Install.mpkg' + pkg 'Install.mpkg' uninstall :pkgutil => 'com.parallels.pkg.virtualization.bundle', :kext => [ 'com.parallels.kext.usbconnect', diff --git a/Casks/pdftk.rb b/Casks/pdftk.rb index ee929a7dea4aa..fec2564e0b60b 100644 --- a/Casks/pdftk.rb +++ b/Casks/pdftk.rb @@ -5,6 +5,6 @@ class Pdftk < Cask url 'http://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/pdftk_server-2.02-mac_osx-10.6-setup.pkg' homepage 'http://www.pdflabs.com/tools/pdftk-server/' - install 'pdftk_server-2.02-mac_osx-10.6-setup.pkg' + pkg 'pdftk_server-2.02-mac_osx-10.6-setup.pkg' uninstall :script => '/opt/pdflabs/pdftk/bin/pdftk_uninstall.sh' end diff --git a/Casks/petite-chez-scheme.rb b/Casks/petite-chez-scheme.rb index 9c2192c03da2d..0247864c29556 100644 --- a/Casks/petite-chez-scheme.rb +++ b/Casks/petite-chez-scheme.rb @@ -5,6 +5,6 @@ class PetiteChezScheme < Cask url 'http://www.scheme.com/download/pcsv8.4-ta6osx-1.pkg.tar.gz' homepage 'http://www.scheme.com/petitechezscheme.html' - install 'pcsv8.4-ta6osx-1.pkg' + pkg 'pcsv8.4-ta6osx-1.pkg' uninstall :pkgutil => 'com.scheme.chezscheme' end diff --git a/Casks/pgloader.rb b/Casks/pgloader.rb index 27500adceb405..81220a8ad3d4b 100644 --- a/Casks/pgloader.rb +++ b/Casks/pgloader.rb @@ -5,6 +5,6 @@ class Pgloader < Cask url 'http://pgloader.io/files/pgloader-3.0.99.pkg' homepage 'http://pgloader.io' - install 'pgloader-3.0.99.pkg' + pkg 'pgloader-3.0.99.pkg' uninstall :pkgutil => 'org.tapoueh.pgloader' end diff --git a/Casks/power-manager.rb b/Casks/power-manager.rb index 28fda6ddbd323..21e53a615531e 100644 --- a/Casks/power-manager.rb +++ b/Casks/power-manager.rb @@ -5,6 +5,6 @@ class PowerManager < Cask url 'https://www.dssw.co.uk/powermanager/dsswpowermanager.dmg' homepage 'https://www.dssw.co.uk/powermanager' - install 'DssW Power Manager.pkg' + pkg 'DssW Power Manager.pkg' uninstall :script => '/Library/Application Support/Power Manager/Remove Power Manager.app/Contents/Resources/Remove Power Manager.sh' end diff --git a/Casks/prey.rb b/Casks/prey.rb index c2db59e1472c9..9238079a43e8d 100644 --- a/Casks/prey.rb +++ b/Casks/prey.rb @@ -5,7 +5,7 @@ class Prey < Cask url 'https://preyproject.com/releases/current/prey-0.6.3-mac-batch.mpkg.zip' homepage 'https://preyproject.com' - install 'prey-0.6.3-mac-batch.mpkg' + pkg 'prey-0.6.3-mac-batch.mpkg' uninstall :pkgutil => 'com.forkhq.prey' caveats <<-EOS.undent Prey requires an API key during installation. If none is found, diff --git a/Casks/private-eye.rb b/Casks/private-eye.rb index 03f9a6c51c38a..4a3801c89bab5 100644 --- a/Casks/private-eye.rb +++ b/Casks/private-eye.rb @@ -5,7 +5,7 @@ class PrivateEye < Cask url 'http://radiosilenceapp.com/downloads/Private%20Eye.pkg' homepage 'http://radiosilenceapp.com/private-eye' - install 'Private Eye.pkg' + pkg 'Private Eye.pkg' # We intentionally unload the kext twice as a workaround # See https://github.com/caskroom/homebrew-cask/pull/1802#issuecomment-34171151 uninstall :early_script => { diff --git a/Casks/programmer-dvorak.rb b/Casks/programmer-dvorak.rb index dcf4c6acbebfa..669dadfeef855 100644 --- a/Casks/programmer-dvorak.rb +++ b/Casks/programmer-dvorak.rb @@ -5,7 +5,7 @@ class ProgrammerDvorak < Cask url 'http://www.kaufmann.no/downloads/macos/ProgrammerDvorak-1_2b9.pkg.zip' homepage 'http://kaufmann.no/roland/dvorak/' - install 'Programmer Dvorak v1.2.pkg' + pkg 'Programmer Dvorak v1.2.pkg' uninstall :pkgutil => 'com.apple.keyboardlayout.Programmer Dvorak', :files => [ '/Library/Keyboard Layouts/Programmer Dvorak.bundle/', diff --git a/Casks/prolific-usb-serial-driver.rb b/Casks/prolific-usb-serial-driver.rb index e13fd23b2e6cd..922aacbe19e9d 100644 --- a/Casks/prolific-usb-serial-driver.rb +++ b/Casks/prolific-usb-serial-driver.rb @@ -5,7 +5,7 @@ class ProlificUsbSerialDriver < Cask url "http://www.prolific.com.tw/UserFiles/files/md_PL2303_MacOSX-10_6up_v#{version.gsub('.', '_')}.zip" homepage 'http://www.prolific.com.tw/US/ShowProduct.aspx?p_id=229&pcid=41' - install "PL2303_MacOSX_v#{version}.pkg" + pkg "PL2303_MacOSX_v#{version}.pkg" uninstall :pkgutil => 'com.prolific.prolificUsbserialCableDriverV*.ProlificUsbSerial.pkg', :kext => 'com.prolific.driver.PL2303' end diff --git a/Casks/punto-switcher.rb b/Casks/punto-switcher.rb index 832f04f29ff7f..4fbbe84098a64 100644 --- a/Casks/punto-switcher.rb +++ b/Casks/punto-switcher.rb @@ -5,7 +5,7 @@ class PuntoSwitcher < Cask url 'http://download.cdn.yandex.net.cache-ams02.cdn.yandex.net/punto/mac/PuntoSwitcher.zip' homepage 'http://punto.yandex.ru' - install 'PuntoSwitcher Installer.pkg' + pkg 'PuntoSwitcher Installer.pkg' uninstall :quit => 'ru.yandex.desktop.PuntoSwitcher', :pkgutil => [ 'ru.yandex.puntoSwitcher*', 'ru.yandex.PuntoSwitcher*' ] end diff --git a/Casks/qgis.rb b/Casks/qgis.rb index f1372af039094..f46073a1acd0c 100644 --- a/Casks/qgis.rb +++ b/Casks/qgis.rb @@ -4,7 +4,7 @@ class Qgis < Cask url "http://www.kyngchaos.com/files/software/qgis/QGIS-#{version}.dmg" homepage 'http://www.kyngchaos.com/software/qgis' - install 'Install QGIS.pkg' + pkg 'Install QGIS.pkg' uninstall :pkgutil => 'org.qgis.qgis-*' caveats do <<-EOS.undent diff --git a/Casks/qqinput.rb b/Casks/qqinput.rb index a0551296517ac..8f0aa178fb326 100644 --- a/Casks/qqinput.rb +++ b/Casks/qqinput.rb @@ -5,6 +5,6 @@ class Qqinput < Cask url 'http://qqime.cdn.sogou.com/QQInput_Mac_Setup_2_8_86_400.dmg' homepage 'http://qq.pinyin.cn/' - install '安装QQ输入法2.8.pkg' + pkg '安装QQ输入法2.8.pkg' uninstall :pkgutil => 'com.tencent.inputmethod.QQInput.*' end diff --git a/Casks/qvod-player.rb b/Casks/qvod-player.rb index 76ec828708b23..4b83e230598a9 100644 --- a/Casks/qvod-player.rb +++ b/Casks/qvod-player.rb @@ -5,6 +5,6 @@ class QvodPlayer < Cask url 'http://dl.kuaibo.com/mac/QvodPlayer_v1.1.26.dmg' homepage 'http://www.qvodcd.com/' - install '双击安装快播.pkg' + pkg '双击安装快播.pkg' uninstall :pkgutil => 'com.kuaibo.pkg.QvodPlayer' end diff --git a/Casks/r.rb b/Casks/r.rb index 2447188967d29..e1b694dac313d 100644 --- a/Casks/r.rb +++ b/Casks/r.rb @@ -2,11 +2,11 @@ class R < Cask if MacOS.version < :mavericks url 'http://cran.rstudio.com/bin/macosx/R-3.1.1-snowleopard.pkg' sha256 '4db95d2bffdaa342a89d01088f47cfe6575ed7e953c31ea4dea629a0942b56b6' - install 'R-3.1.1-snowleopard.pkg' + pkg 'R-3.1.1-snowleopard.pkg' else url 'http://cran.rstudio.com/bin/macosx/R-3.1.1-mavericks.pkg' sha256 'd2f4e4f68628d998f81146eacd929ef6fb9bc01ca93d968e6562a3a6372c4d93' - install 'R-3.1.1-mavericks.pkg' + pkg 'R-3.1.1-mavericks.pkg' end homepage 'http://www.r-project.org/' version '3.1.1' diff --git a/Casks/razer-synapse.rb b/Casks/razer-synapse.rb index 8fffcf31cd50b..881c9315bcd80 100644 --- a/Casks/razer-synapse.rb +++ b/Casks/razer-synapse.rb @@ -5,6 +5,6 @@ class RazerSynapse < Cask url 'http://dl.razerzone.com/drivers/Synapse2/mac/Razer_Synapse_2.0_Mac_Driver_v1.25.dmg' homepage 'http://www.razerzone.com/synapse2' - install 'Razer Synapse 2.0.pkg' + pkg 'Razer Synapse 2.0.pkg' uninstall :script => '/Applications/Utilities/Uninstall Razer Synapse 2.0.app/Contents/MacOS/Uninstall Razer Synapse 2.0' end diff --git a/Casks/rekordbox.rb b/Casks/rekordbox.rb index 6e1a1bc841205..0d12a272b4e75 100644 --- a/Casks/rekordbox.rb +++ b/Casks/rekordbox.rb @@ -5,7 +5,7 @@ class Rekordbox < Cask url 'http://rekordbox.com/_app/files/Install_rekordbox_3_0_1.pkg.zip' homepage 'http://rekordbox.com/en/' - install 'Install_rekordbox_3_0_1.pkg' + pkg 'Install_rekordbox_3_0_1.pkg' uninstall :pkgutil => 'com.pioneer.rekordbox.3.*', :files => '/Applications/rekordbox 3/' end diff --git a/Casks/remote-desktop-connection.rb b/Casks/remote-desktop-connection.rb index d45d90f94d7eb..bf494fcc6ed48 100644 --- a/Casks/remote-desktop-connection.rb +++ b/Casks/remote-desktop-connection.rb @@ -5,6 +5,6 @@ class RemoteDesktopConnection < Cask url 'http://download.microsoft.com/download/C/F/0/CF0AE39A-3307-4D39-9D50-58E699C91B2F/RDC_2.1.1_ALL.dmg' homepage 'http://www.microsoft.com/en-us/download/details.aspx?id=18140' - install 'RDC Installer.mpkg' + pkg 'RDC Installer.mpkg' uninstall :pkgutil => 'com.microsoft.rdc.all.*' end diff --git a/Casks/ridibooks.rb b/Casks/ridibooks.rb index 9cd9b9f1ea424..2f755292f1ce9 100644 --- a/Casks/ridibooks.rb +++ b/Casks/ridibooks.rb @@ -9,6 +9,6 @@ class Ridibooks < Cask preflight do system '/bin/mv', '--', destination_path.join('getapp'), destination_path.join('ridibooks.pkg') end - install 'ridibooks.pkg' + pkg 'ridibooks.pkg' uninstall :pkgutil => 'com.ridibooks.Ridibooks' end diff --git a/Casks/riffworkst4.rb b/Casks/riffworkst4.rb index e42324e6ad8f0..299f2c4cf4bda 100644 --- a/Casks/riffworkst4.rb +++ b/Casks/riffworkst4.rb @@ -6,6 +6,6 @@ class Riffworkst4 < Cask url 'https://www.sonomawireworks.com/accountManagerUI/files/RiffWorksT4.dmg' homepage 'http://www.sonomawireworks.com/T4/' - install 'RiffWorksT4V2_6.pkg' + pkg 'RiffWorksT4V2_6.pkg' uninstall :pkgutil => 'com.sonomawireworks.riffworkst4' end diff --git a/Casks/rust.rb b/Casks/rust.rb index ddfde807b064f..05b83571518f2 100644 --- a/Casks/rust.rb +++ b/Casks/rust.rb @@ -5,6 +5,6 @@ class Rust < Cask url "http://static.rust-lang.org/dist/rust-nightly-x86_64-apple-darwin.pkg" homepage 'http://www.rust-lang.org/' - install 'rust-nightly-x86_64-apple-darwin.pkg' + pkg 'rust-nightly-x86_64-apple-darwin.pkg' uninstall :pkgutil => 'org.rust-lang.rust' end diff --git a/Casks/safaritabswitching.rb b/Casks/safaritabswitching.rb index 48afe46dfee2d..98551ff6a73eb 100644 --- a/Casks/safaritabswitching.rb +++ b/Casks/safaritabswitching.rb @@ -5,6 +5,6 @@ class Safaritabswitching < Cask url 'https://github.com/rs/SafariTabSwitching/releases/download/1.2.6/Safari.Tab.Switching-1.2.6.pkg' homepage 'https://github.com/rs/SafariTabSwitching' - install 'Safari.Tab.Switching-1.2.6.pkg' + pkg 'Safari.Tab.Switching-1.2.6.pkg' uninstall :pkgutil => 'net.rhapsodyk.SafariTabSwitching.pkg' end diff --git a/Casks/scansnap-manager.rb b/Casks/scansnap-manager.rb index 30ef9657d8d79..5daf75707a4f5 100644 --- a/Casks/scansnap-manager.rb +++ b/Casks/scansnap-manager.rb @@ -5,6 +5,6 @@ class ScansnapManager < Cask url 'https://www.fujitsu.com/downloads/IMAGE/driver/ss/mgr/m-sv600/MacScanSnapV62L10WW.dmg' homepage 'http://www.fujitsu.com/global/support/computing/peripheral/scanners/software/' - install 'ScanSnap Manager.pkg' + pkg 'ScanSnap Manager.pkg' uninstall :pkgutil => 'jp.co.pfu.ScanSnap.*' end diff --git a/Casks/screens-connect.rb b/Casks/screens-connect.rb index ac467789e6dac..2481a719de6b9 100644 --- a/Casks/screens-connect.rb +++ b/Casks/screens-connect.rb @@ -5,7 +5,7 @@ class ScreensConnect < Cask url 'https://screensconnect.com/downloads/screensconnect.dmg' homepage 'https://screensconnect.com' - install 'Screens Connect.pkg' + pkg 'Screens Connect.pkg' uninstall :script => 'Uninstall Screens Connect.app/Contents/Resources/sc-uninstaller.tool' uninstall_preflight do diff --git a/Casks/sdformatter.rb b/Casks/sdformatter.rb index 148df828109ee..fdfa039702518 100644 --- a/Casks/sdformatter.rb +++ b/Casks/sdformatter.rb @@ -5,6 +5,6 @@ class Sdformatter < Cask url 'https://www.sdcard.org/downloads/formatter_4/eula_mac/SDFormatter_4.00B.pkg' homepage 'https://www.sdcard.org' - install 'SDFormatter_4.00B.pkg' + pkg 'SDFormatter_4.00B.pkg' uninstall :pkgutil => 'jp.co.trendy.sdformatter.SDFormatter.pkg' end diff --git a/Casks/seil.rb b/Casks/seil.rb index 6bb3ca9ca87d0..5c005d638035c 100644 --- a/Casks/seil.rb +++ b/Casks/seil.rb @@ -5,7 +5,7 @@ class Seil < Cask url 'https://pqrs.org/macosx/keyremap4macbook/files/Seil-10.10.0.dmg' homepage 'https://pqrs.org/macosx/keyremap4macbook/seil.html.en' - install 'Seil.pkg' + pkg 'Seil.pkg' uninstall :quit => 'org.pqrs.Seil', :kext => 'org.pqrs.driver.Seil', :pkgutil => 'org.pqrs.driver.Seil' diff --git a/Casks/send-to-kindle.rb b/Casks/send-to-kindle.rb index d64cedc7a4fa7..bd894c6613d19 100644 --- a/Casks/send-to-kindle.rb +++ b/Casks/send-to-kindle.rb @@ -5,7 +5,7 @@ class SendToKindle < Cask url 'https://s3.amazonaws.com/sendtokindle/SendToKindleForMac-installer-v1.0.0.220.pkg' homepage 'http://www.amazon.com/gp/sendtokindle/mac' - install 'SendToKindleForMac-installer-v1.0.0.220.pkg' + pkg 'SendToKindleForMac-installer-v1.0.0.220.pkg' uninstall :launchctl => 'com.amazon.sendtokindle.launcher', :pkgutil => 'com.amazon.SendToKindleMacInstaller.pkg' end diff --git a/Casks/silverlight.rb b/Casks/silverlight.rb index bf8562a1cc031..ab91c584c00a1 100644 --- a/Casks/silverlight.rb +++ b/Casks/silverlight.rb @@ -5,6 +5,6 @@ class Silverlight < Cask url 'http://silverlight.dlservice.microsoft.com/download/F/8/C/F8C0EACB-92D0-4722-9B18-965DD2A681E9/30514.00/Silverlight.dmg' homepage 'http://www.microsoft.com/silverlight/' - install 'Silverlight.pkg' + pkg 'Silverlight.pkg' uninstall :pkgutil => 'com.microsoft.SilverlightInstaller' end diff --git a/Casks/skydrive.rb b/Casks/skydrive.rb index 903697b1d5e5b..f1ed7fb180163 100644 --- a/Casks/skydrive.rb +++ b/Casks/skydrive.rb @@ -5,7 +5,7 @@ class Skydrive < Cask url 'http://wl.dlservice.microsoft.com/download/5/6/E/56EAD987-4914-4E8D-A7AD-DF4ADA7E2C5F/SkyDrive.pkg' homepage 'http://windows.microsoft.com/en-us/skydrive/download' - install 'SkyDrive.pkg' + pkg 'SkyDrive.pkg' uninstall :pkgutil => 'com.microsoft.SkyDriveInstaller', :files => '/Applications/SkyDrive.app' end diff --git a/Casks/smoothmouse.rb b/Casks/smoothmouse.rb index a808a0f8db253..c9187ae71faee 100644 --- a/Casks/smoothmouse.rb +++ b/Casks/smoothmouse.rb @@ -5,7 +5,7 @@ class Smoothmouse < Cask url 'http://smoothmouse.com/download/latest' homepage 'http://smoothmouse.com' - install 'SmoothMouse.pkg' + pkg 'SmoothMouse.pkg' uninstall :launchctl => [ 'com.cyberic.smoothmouse', 'com.cyberic.smoothmouseupdater', diff --git a/Casks/snip.rb b/Casks/snip.rb index 8a86d8e75212b..f501abb751d06 100644 --- a/Casks/snip.rb +++ b/Casks/snip.rb @@ -5,6 +5,6 @@ class Snip < Cask url 'http://snip.qq.com/resources/Snip_V2.0_5771.dmg' homepage 'http://snip.qq.com/' - install 'Snip_V2.0.pkg' + pkg 'Snip_V2.0.pkg' uninstall :pkgutil => 'com.tencent.snip.Snip.pkg' end diff --git a/Casks/soulseek.rb b/Casks/soulseek.rb index 54b60f513feb5..e8b0bfcf15bce 100644 --- a/Casks/soulseek.rb +++ b/Casks/soulseek.rb @@ -5,6 +5,6 @@ class Soulseek < Cask url 'http://www.soulseekqt.net/SoulseekQt/Mac/SoulseekQt-2014-6-15.pkg' homepage 'http://www.soulseekqt.net/' - install 'SoulseekQt-2014-6-15.pkg' + pkg 'SoulseekQt-2014-6-15.pkg' uninstall :pkgutil => 'com.soulseek.SoulseekQt.pkg' end diff --git a/Casks/soundflower.rb b/Casks/soundflower.rb index 38aa994d1ada3..4d03aef91a55b 100644 --- a/Casks/soundflower.rb +++ b/Casks/soundflower.rb @@ -5,7 +5,7 @@ class Soundflower < Cask url 'https://soundflower.googlecode.com/files/Soundflower-1.6.6b.dmg' homepage 'https://code.google.com/p/soundflower/' - install 'Soundflower.pkg', :allow_untrusted => true + pkg 'Soundflower.pkg', :allow_untrusted => true uninstall :pkgutil => 'com.cycling74.soundflower.*' caveats do reboot diff --git a/Casks/splashtop-personal.rb b/Casks/splashtop-personal.rb index 02752e3a7faa4..7e10790de1869 100644 --- a/Casks/splashtop-personal.rb +++ b/Casks/splashtop-personal.rb @@ -5,6 +5,6 @@ class SplashtopPersonal < Cask url 'https://d17kmd0va0f0mp.cloudfront.net/macclient/STP/Splashtop_Personal_v2.4.3.1.dmg' homepage 'http://www.splashtop.com/personal' - install 'Splashtop Personal.pkg' + pkg 'Splashtop Personal.pkg' uninstall :pkgutil => 'com.splashtop.stp.*' end diff --git a/Casks/splashtop-streamer.rb b/Casks/splashtop-streamer.rb index 66b69f64efec8..89ee8c625a3fd 100644 --- a/Casks/splashtop-streamer.rb +++ b/Casks/splashtop-streamer.rb @@ -5,6 +5,6 @@ class SplashtopStreamer < Cask url 'https://d17kmd0va0f0mp.cloudfront.net/mac/Splashtop_Streamer_MAC_v2.4.5.3.dmg' homepage 'http://www.splashtop.com/downloads' - install 'Splashtop Streamer.pkg' + pkg 'Splashtop Streamer.pkg' uninstall :pkgutil => 'com.splashtop.splashtopStreamer.*' end diff --git a/Casks/squirrel.rb b/Casks/squirrel.rb index eff59d83221c1..4b9a5a34c7d6a 100644 --- a/Casks/squirrel.rb +++ b/Casks/squirrel.rb @@ -5,6 +5,6 @@ class Squirrel < Cask url 'https://dl.bintray.com/lotem/rime/Squirrel-0.9.25.zip' homepage 'https://github.com/lotem/squirrel' - install 'Squirrel.pkg' + pkg 'Squirrel.pkg' uninstall :files => '/Library/Input Methods/Squirrel.app' end diff --git a/Casks/sshfs.rb b/Casks/sshfs.rb index a39c50377f583..2b71558a4786b 100644 --- a/Casks/sshfs.rb +++ b/Casks/sshfs.rb @@ -5,6 +5,6 @@ class Sshfs < Cask url 'https://github.com/osxfuse/sshfs/releases/download/osxfuse-sshfs-2.5.0/sshfs-2.5.0.pkg' homepage 'http://osxfuse.github.io/' - install 'sshfs-2.5.0.pkg' + pkg 'sshfs-2.5.0.pkg' uninstall :pkgutil => 'com.github.osxfuse.pkg.SSHFS' end diff --git a/Casks/steermouse.rb b/Casks/steermouse.rb index db4941e8cbaa3..f71ea93ebb910 100644 --- a/Casks/steermouse.rb +++ b/Casks/steermouse.rb @@ -5,7 +5,7 @@ class Steermouse < Cask url 'http://plentycom.jp/ctrl/files_sm/SteerMouse4.1.9.dmg' homepage 'http://plentycom.jp/en/steermouse/' - install 'SteerMouse Installer.app/Contents/Resources/SteerMouse.pkg' + pkg 'SteerMouse Installer.app/Contents/Resources/SteerMouse.pkg' uninstall :pkgutil => 'jp.plentycom.SteerMouse.pkg.*', :kext => 'com.cyberic.SmoothMouse' end diff --git a/Casks/synology-cloud-station.rb b/Casks/synology-cloud-station.rb index f419e0ac77faa..bebd8cbe2eeb0 100644 --- a/Casks/synology-cloud-station.rb +++ b/Casks/synology-cloud-station.rb @@ -5,7 +5,7 @@ class SynologyCloudStation < Cask url "https://global.download.synology.com/download/Tools/CloudStation/#{version}/Mac/CloudStation-#{version}-Mac-Installer.dmg" homepage 'http://www.synology.com/' - install "CloudStation-#{version}-Mac-Installer.pkg" + pkg "CloudStation-#{version}-Mac-Installer.pkg" uninstall :pkgutil => 'synology.cloudstation.installer', :launchctl => 'com.synology.Synology Cloud Station' end diff --git a/Casks/synology-photo-station-uploader.rb b/Casks/synology-photo-station-uploader.rb index 504df4c309d13..4faf3bdb5c27c 100644 --- a/Casks/synology-photo-station-uploader.rb +++ b/Casks/synology-photo-station-uploader.rb @@ -5,6 +5,6 @@ class SynologyPhotoStationUploader < Cask url 'https://global.download.synology.com/download/Tools/PhotoStationUploader/046/Mac/PhotoStationUploader-046-Mac-Installer.dmg' homepage 'http://www.synology.com/' - install 'PhotoStationUploader-046-Mac-Installer.pkg' + pkg 'PhotoStationUploader-046-Mac-Installer.pkg' uninstall :pkgutil => 'com.synology.photostationuploader.installer' end diff --git a/Casks/tcpblock.rb b/Casks/tcpblock.rb index b366bb8cd73e2..d3073cf2a26c9 100644 --- a/Casks/tcpblock.rb +++ b/Casks/tcpblock.rb @@ -5,6 +5,6 @@ class Tcpblock < Cask url 'http://www.delantis.com/dist/TCPBlock_v4.2.dmg' homepage 'http://tcpblock.wordpress.com/' - install 'TCPBlock_v4.2.pkg' + pkg 'TCPBlock_v4.2.pkg' uninstall :pkgutil => 'com.delantis.tcpblock.*' end diff --git a/Casks/td-agent.rb b/Casks/td-agent.rb index d964eb5f465ea..c462d290872e5 100644 --- a/Casks/td-agent.rb +++ b/Casks/td-agent.rb @@ -5,7 +5,7 @@ class TdAgent < Cask url 'http://packages.treasuredata.com/2/macosx/td-agent-2.0.3-0.dmg' homepage 'http://www.fluentd.org/' - install 'td-agent2.pkg' + pkg 'td-agent2.pkg' uninstall :pkgutil => 'test.treasuredatainc.pkg.tdagent2', :launchctl => 'td-agent' end diff --git a/Casks/td-toolbelt.rb b/Casks/td-toolbelt.rb index ff577815f2d8b..772544419ff80 100644 --- a/Casks/td-toolbelt.rb +++ b/Casks/td-toolbelt.rb @@ -10,7 +10,7 @@ class TdToolbelt < Cask system '/bin/mv', '--', "#{destination_path}/mac", "#{destination_path}/td-toolbelt.pkg" end - install 'td-toolbelt.pkg' + pkg 'td-toolbelt.pkg' uninstall :pkgutil => 'com.td.toolbelt' # zap :pkgutil => 'org.ruby-lang.installer' end diff --git a/Casks/teamviewer.rb b/Casks/teamviewer.rb index 8895ff3cfab81..2b5e9bca400bd 100644 --- a/Casks/teamviewer.rb +++ b/Casks/teamviewer.rb @@ -5,7 +5,7 @@ class Teamviewer < Cask url 'https://download.teamviewer.com/download/TeamViewer.dmg' homepage 'http://www.teamviewer.com/' - install 'Install TeamViewer.pkg' + pkg 'Install TeamViewer.pkg' uninstall :pkgutil => 'com.teamviewer.*', :launchctl => 'com.teamviewer.service', :files => [ diff --git a/Casks/toad-mac.rb b/Casks/toad-mac.rb index fd64d2ec0fc96..0c5d0bde3801b 100644 --- a/Casks/toad-mac.rb +++ b/Casks/toad-mac.rb @@ -5,6 +5,6 @@ class ToadMac < Cask url 'http://community-downloads.quest.com/toadsoft/toadmacedition/ToadMacEdition_108.pkg' homepage 'http://www.toadworld.com/products/toad-mac-edition/default.aspx' - install 'ToadMacEdition_108.pkg' + pkg 'ToadMacEdition_108.pkg' uninstall :pkgutil => 'com.dell.Toad', :files => '/Applications/Toad.app' end diff --git a/Casks/totalfinder.rb b/Casks/totalfinder.rb index e36b18f16d676..3e34e1bd07039 100644 --- a/Casks/totalfinder.rb +++ b/Casks/totalfinder.rb @@ -5,7 +5,7 @@ class Totalfinder < Cask url "http://downloads.binaryage.com/TotalFinder-#{version}.dmg" homepage 'http://totalfinder.binaryage.com' - install 'TotalFinder.pkg' + pkg 'TotalFinder.pkg' uninstall :script => { :executable => 'TotalFinder Uninstaller.app/Contents/MacOS/TotalFinder Uninstaller', :args => %w[--headless] diff --git a/Casks/totalspaces.rb b/Casks/totalspaces.rb index 0012464745e6d..2e0bdf365c8a9 100644 --- a/Casks/totalspaces.rb +++ b/Casks/totalspaces.rb @@ -2,7 +2,7 @@ class Totalspaces < Cask if MacOS.version < :mavericks url 'http://downloads.binaryage.com/TotalSpaces-1.2.11.zip' version '1.2.11' - install 'TotalSpaces.pkg' + pkg 'TotalSpaces.pkg' sha256 'fd54c6ea092f6fae2035745959ff6e080953e77ec6c76715e532b4b0352235d4' uninstall :pkgutil => 'com.switchstep.totalspaces', :quit => 'com.binaryage.TotalSpaces', @@ -13,7 +13,7 @@ class Totalspaces < Cask else url "http://downloads.binaryage.com/TotalSpaces2-2.2.6.zip" version '2.2.6' - install 'TotalSpaces2.pkg' + pkg 'TotalSpaces2.pkg' sha256 '900ece3f5ceae479b4019f854e1875eb402edf3ef1b17f813a70fe42290a0a12' uninstall :pkgutil => 'com.binaryage.TotalSpaces2', :quit => 'com.binaryage.TotalSpaces2', diff --git a/Casks/totalterminal.rb b/Casks/totalterminal.rb index 7679037dc60c3..b1fffeb08e714 100644 --- a/Casks/totalterminal.rb +++ b/Casks/totalterminal.rb @@ -5,7 +5,7 @@ class Totalterminal < Cask url 'http://downloads.binaryage.com/TotalTerminal-1.5.3.dmg' homepage 'http://totalterminal.binaryage.com' - install 'TotalTerminal.pkg' + pkg 'TotalTerminal.pkg' uninstall :script => { :executable => 'TotalTerminal Uninstaller.app/Contents/MacOS/TotalTerminal Uninstaller', :args => %w[--headless] diff --git a/Casks/transmission-remote-gui.rb b/Casks/transmission-remote-gui.rb index 5948d4d751530..46db4f3f3349d 100644 --- a/Casks/transmission-remote-gui.rb +++ b/Casks/transmission-remote-gui.rb @@ -5,6 +5,6 @@ class TransmissionRemoteGui < Cask url 'https://transmisson-remote-gui.googlecode.com/files/transgui-5.0.1.dmg' homepage 'https://code.google.com/p/transmisson-remote-gui/' - install 'transgui.pkg' + pkg 'transgui.pkg' uninstall :pkgutil => 'com.transgui.*' end diff --git a/Casks/truecrypt.rb b/Casks/truecrypt.rb index b6fa006c478b6..62b1c0d8315f1 100644 --- a/Casks/truecrypt.rb +++ b/Casks/truecrypt.rb @@ -5,7 +5,7 @@ class Truecrypt < Cask url 'https://downloads.sourceforge.net/sourceforge/truecrypt/TrueCrypt-7.2-Mac-OS-X.dmg' homepage 'http://truecrypt.org/' - install 'TrueCrypt 7.2.mpkg' + pkg 'TrueCrypt 7.2.mpkg' caveats do files_in_usr_local <<-EOS.undent diff --git a/Casks/tvmobili.rb b/Casks/tvmobili.rb index 31bab5f610e89..059998c230f2f 100644 --- a/Casks/tvmobili.rb +++ b/Casks/tvmobili.rb @@ -5,7 +5,7 @@ class Tvmobili < Cask url 'http://www.tvmobili.com/binaries/stable/tvmobili-mountainlion-universal.dmg' homepage 'http://www.tvmobili.com/' - install 'tvmobili-mountainlion-universal.2.1.4481.pkg' + pkg 'tvmobili-mountainlion-universal.2.1.4481.pkg' uninstall :pkgutil => 'com.tvmobili.tvmobilisvcd', :launchctl => [ 'com.tvmobili.artwork', diff --git a/Casks/twindocs.rb b/Casks/twindocs.rb index 373608e717410..c481dc501b52c 100644 --- a/Casks/twindocs.rb +++ b/Casks/twindocs.rb @@ -5,6 +5,6 @@ class Twindocs < Cask url 'https://www.twindocs.com/plugins/es/tools_mac/Twindocs%20tools.pkg.zip' homepage 'https://www.twindocs.com' - install 'Twindocs tools.pkg' + pkg 'Twindocs tools.pkg' uninstall :pkgutil => 'com.twindocs.ambassador' end diff --git a/Casks/undercover.rb b/Casks/undercover.rb index bd1244fdb6f7a..8aea786520678 100644 --- a/Casks/undercover.rb +++ b/Casks/undercover.rb @@ -5,7 +5,7 @@ class Undercover < Cask url 'http://assets.undercoverhq.com/client/6.0/undercover_mac.pkg' homepage 'http://www.orbicule.com/undercover/mac/' - install 'undercover_mac.pkg' + pkg 'undercover_mac.pkg' uninstall :pkgutil => 'com.orbicule.pkg.Undercover', :quit => [ 'com.orbicule.uc', 'com.orbicule.UCAgent' ], diff --git a/Casks/unity-web-player.rb b/Casks/unity-web-player.rb index 4ef8726f7cb45..4d0323491e045 100644 --- a/Casks/unity-web-player.rb +++ b/Casks/unity-web-player.rb @@ -5,7 +5,7 @@ class UnityWebPlayer < Cask url 'http://webplayer.unity3d.com/download_webplayer-3.x/webplayer-mini.dmg' homepage 'https://unity3d.com/webplayer' - install 'Install Unity Web Player.pkg' + pkg 'Install Unity Web Player.pkg' uninstall :pkgutil => 'com.unity.UnityWebPlayer', :files => '/Library/Internet Plug-Ins/Unity Web Player.plugin' end diff --git a/Casks/unity3d.rb b/Casks/unity3d.rb index a8761b854f025..0f716192042c3 100644 --- a/Casks/unity3d.rb +++ b/Casks/unity3d.rb @@ -5,6 +5,6 @@ class Unity3d < Cask url 'http://netstorage.unity3d.com/unity/unity-4.5.2.dmg' homepage 'http://unity3d.com/unity/' - install 'Unity.pkg' + pkg 'Unity.pkg' uninstall :pkgutil => 'com.unity3d.*' end diff --git a/Casks/usb-overdrive.rb b/Casks/usb-overdrive.rb index 691261b21b7da..8378bfa1818a2 100644 --- a/Casks/usb-overdrive.rb +++ b/Casks/usb-overdrive.rb @@ -5,6 +5,6 @@ class UsbOverdrive < Cask url 'http://www.senlick.com/macsw/USB-Overdrive-302.dmg' homepage 'http://www.usboverdrive.com/' - install 'Install USB Overdrive.pkg' + pkg 'Install USB Overdrive.pkg' uninstall :pkgutil => 'com.usboverdrive.installer' end diff --git a/Casks/utc-menu-clock.rb b/Casks/utc-menu-clock.rb index c4381374f3df7..88783ab41ed8e 100644 --- a/Casks/utc-menu-clock.rb +++ b/Casks/utc-menu-clock.rb @@ -4,5 +4,5 @@ class UtcMenuClock < Cask url "https://github.com/downloads/netik/UTCMenuClock/UTCMenuClock_#{version}_installer.pkg" homepage 'https://github.com/netik/UTCMenuClock' - install "UTCMenuClock_#{version}_installer.pkg" + pkg "UTCMenuClock_#{version}_installer.pkg" end diff --git a/Casks/vagrant.rb b/Casks/vagrant.rb index 5f847e4ca8067..d60207ef6d1f4 100644 --- a/Casks/vagrant.rb +++ b/Casks/vagrant.rb @@ -5,6 +5,6 @@ class Vagrant < Cask url 'https://dl.bintray.com/mitchellh/vagrant/vagrant_1.6.5.dmg' homepage 'http://www.vagrantup.com' - install 'Vagrant.pkg' + pkg 'Vagrant.pkg' uninstall :script => { :executable => 'uninstall.tool', :input => %w[Yes] } end diff --git a/Casks/virtualbox.rb b/Casks/virtualbox.rb index b3976a614eda1..9fc9571f03a8e 100644 --- a/Casks/virtualbox.rb +++ b/Casks/virtualbox.rb @@ -5,6 +5,6 @@ class Virtualbox < Cask url "http://download.virtualbox.org/virtualbox/#{version.gsub(/-.*/, '')}/VirtualBox-#{version}-OSX.dmg" homepage 'http://www.virtualbox.org' - install 'VirtualBox.pkg' + pkg 'VirtualBox.pkg' uninstall :script => { :executable => 'VirtualBox_Uninstall.tool', :args => %w[--unattended] } end diff --git a/Casks/wacom-bamboo-tablet.rb b/Casks/wacom-bamboo-tablet.rb index c8450775285e6..725d5db2ebfc5 100644 --- a/Casks/wacom-bamboo-tablet.rb +++ b/Casks/wacom-bamboo-tablet.rb @@ -5,7 +5,7 @@ class WacomBambooTablet < Cask url 'http://cdn.wacom.com/U/Drivers/Mac/Consumer/533/PenTablet_5.3.3-3.dmg' homepage 'http://us.wacom.com/en/support/drivers' - install 'Install Wacom Tablet.pkg' + pkg 'Install Wacom Tablet.pkg' uninstall :launchctl => 'com.wacom.pentablet', :quit => [ 'com.wacom.TabletDriver', diff --git a/Casks/wacom-tablet.rb b/Casks/wacom-tablet.rb index be225b0f850b2..a9c53ffd093b5 100644 --- a/Casks/wacom-tablet.rb +++ b/Casks/wacom-tablet.rb @@ -5,7 +5,7 @@ class WacomTablet < Cask url 'http://cdn.wacom.com/u/drivers/mac/pro/WacomTablet_6.3.8-2.dmg' homepage 'http://www.wacom.com/' - install 'Install Wacom Tablet.pkg' + pkg 'Install Wacom Tablet.pkg' uninstall :launchctl => 'com.wacom.wacomtablet', :quit => [ 'com.wacom.TabletDriver', diff --git a/Casks/wavtap.rb b/Casks/wavtap.rb index 7f8d08fcd6ae0..1e07dd1803809 100644 --- a/Casks/wavtap.rb +++ b/Casks/wavtap.rb @@ -5,6 +5,6 @@ class Wavtap < Cask url 'https://github.com/downloads/pje/WavTap/WavTap%200.2.0.pkg' homepage 'https://github.com/pje/wavtap' - install 'WavTap 0.2.0.pkg' + pkg 'WavTap 0.2.0.pkg' uninstall :pkgutil => 'com.wavtap.*', :kext => 'com.wavtap.driver.WavTap' end diff --git a/Casks/whatpulse.rb b/Casks/whatpulse.rb index b5507fbcba245..c3bf5e11d2b25 100644 --- a/Casks/whatpulse.rb +++ b/Casks/whatpulse.rb @@ -5,7 +5,7 @@ class Whatpulse < Cask url 'http://amcdn.whatpulse.org/files/whatpulse-mac-2.4.dmg' homepage 'http://www.whatpulse.org/' - install 'WhatPulse 2.4.mpkg' + pkg 'WhatPulse 2.4.mpkg' uninstall :files => [ '/Applications/WhatPulse.app', '/Library/StartupItems/ChmodBPF' diff --git a/Casks/wireshark.rb b/Casks/wireshark.rb index 8f85d57a5a9cc..71a89586c3d43 100644 --- a/Casks/wireshark.rb +++ b/Casks/wireshark.rb @@ -5,7 +5,7 @@ class Wireshark < Cask url "https://www.wireshark.org/download/osx/Wireshark%20#{version}%20Intel%2064.dmg" homepage 'http://www.wireshark.org' - install "Wireshark #{version} Intel 64.pkg" + pkg "Wireshark #{version} Intel 64.pkg" caveats do x11_required diff --git a/Casks/xamarin-android.rb b/Casks/xamarin-android.rb index cc9c4bd387bf2..13ca980e71ef4 100644 --- a/Casks/xamarin-android.rb +++ b/Casks/xamarin-android.rb @@ -7,6 +7,6 @@ class XamarinAndroid < Cask appcast 'http://xamarin.com/installer_assets/v3/Mac/Universal/InstallationManifest.xml' homepage 'http://xamarin.com/android' - install 'mono-android-4.12.5-2.pkg' + pkg 'mono-android-4.12.5-2.pkg' uninstall :pkgutil => 'com.xamarin.android.pkg' end diff --git a/Casks/xamarin-ios.rb b/Casks/xamarin-ios.rb index 65769da77aa03..fa548579f8cdd 100644 --- a/Casks/xamarin-ios.rb +++ b/Casks/xamarin-ios.rb @@ -7,6 +7,6 @@ class XamarinIos < Cask appcast 'http://xamarin.com/installer_assets/v3/Mac/Universal/InstallationManifest.xml' homepage 'http://xamarin.com/ios' - install 'monotouch-7.2.4.4.pkg' + pkg 'monotouch-7.2.4.4.pkg' uninstall :pkgutil => 'com.xamarin.monotouch.pkg' end diff --git a/Casks/xbox360-controller-driver.rb b/Casks/xbox360-controller-driver.rb index 0c635967db075..a45e57f75f1b2 100644 --- a/Casks/xbox360-controller-driver.rb +++ b/Casks/xbox360-controller-driver.rb @@ -5,6 +5,6 @@ class Xbox360ControllerDriver < Cask url 'http://files.tattiebogle.net/360/360ControllerInstall.dmg' homepage 'http://tattiebogle.net/index.php/ProjectRoot/Xbox360Controller/OsxDriver' - install 'Install360Controller.pkg' + pkg 'Install360Controller.pkg' uninstall :pkgutil => 'com.mice.pkg.Xbox360controller' end diff --git a/Casks/xmarks-safari.rb b/Casks/xmarks-safari.rb index 62c1d1dab7da4..83b551198d07b 100644 --- a/Casks/xmarks-safari.rb +++ b/Casks/xmarks-safari.rb @@ -5,7 +5,7 @@ class XmarksSafari < Cask url "https://static.xmarks.com/clients/safari/xmarks_for_safari_#{version}.dmg" homepage 'http://www.xmarks.com/' - install 'Xmarks for Safari Installer.pkg' + pkg 'Xmarks for Safari Installer.pkg' uninstall :pkgutil => [ 'com.xmarks.XmarksForSafari.pkg', 'com.xmarks.XmarksPreferencePane.pkg', diff --git a/Casks/xquartz.rb b/Casks/xquartz.rb index 78ba772993843..377214e5b4acf 100644 --- a/Casks/xquartz.rb +++ b/Casks/xquartz.rb @@ -6,7 +6,7 @@ class Xquartz < Cask appcast 'http://xquartz-dl.macosforge.org/sparkle/release.xml' homepage 'http://xquartz.macosforge.org/' - install 'XQuartz.pkg' + pkg 'XQuartz.pkg' postflight do Pathname.new(File.expand_path('~')).join('Library', 'Logs').mkpath diff --git a/Casks/xtrafinder.rb b/Casks/xtrafinder.rb index e80ff6e18f7f0..dda536b85cbd6 100644 --- a/Casks/xtrafinder.rb +++ b/Casks/xtrafinder.rb @@ -5,6 +5,6 @@ class Xtrafinder < Cask url 'http://www.trankynam.com/xtrafinder/downloads/XtraFinder.dmg' homepage 'http://www.trankynam.com/xtrafinder/' - install 'XtraFinder.pkg' + pkg 'XtraFinder.pkg' uninstall :pkgutil => 'com.trankynam.xtrafinder.*' end diff --git a/Casks/yubikey-personalization-gui.rb b/Casks/yubikey-personalization-gui.rb index 127409f0cb1d3..a386fb8099d7a 100644 --- a/Casks/yubikey-personalization-gui.rb +++ b/Casks/yubikey-personalization-gui.rb @@ -5,6 +5,6 @@ class YubikeyPersonalizationGui < Cask url 'https://www.yubico.com/wp-content/uploads/2012/09/yubikey-personalization-gui-3.1.14.pkg' homepage 'http://www.yubico.com/products/services-software/personalization-tools/use/' - install 'yubikey-personalization-gui-3.1.14.pkg' + pkg 'yubikey-personalization-gui-3.1.14.pkg' uninstall :pkgutil => 'com.yubico.YKPersonalization' end diff --git a/Casks/zendserver.rb b/Casks/zendserver.rb index b1b3e7e2e48c5..618c6e069ff0a 100644 --- a/Casks/zendserver.rb +++ b/Casks/zendserver.rb @@ -5,7 +5,7 @@ class Zendserver < Cask url 'http://downloads.zend.com/zendserver/6.3.0/ZendServer-6.3.0-php-5.5.7.dmg' homepage 'http://www.zend.com/en/products/server/' - install 'Zend Server.pkg' + pkg 'Zend Server.pkg' uninstall :script => { :executable => '/usr/local/zend/bin/uninstall.sh', :args => ['--automatic'] } caveats do files_in_usr_local diff --git a/Casks/zeroinstall.rb b/Casks/zeroinstall.rb index 82b3db964ea57..dfa33b954558a 100644 --- a/Casks/zeroinstall.rb +++ b/Casks/zeroinstall.rb @@ -5,6 +5,6 @@ class Zeroinstall < Cask url 'https://downloads.sourceforge.net/project/zero-install/0install/2.7/ZeroInstall.pkg' homepage 'http://0install.net' - install 'ZeroInstall.pkg' + pkg 'ZeroInstall.pkg' uninstall :pkgutil => 'net.0install.pkg' end diff --git a/Casks/zoomus.rb b/Casks/zoomus.rb index 7cad6e64fd7e2..ef310d0639aa7 100644 --- a/Casks/zoomus.rb +++ b/Casks/zoomus.rb @@ -5,7 +5,7 @@ class Zoomus < Cask url 'https://zoom.us/client/latest/zoomusInstaller.pkg' homepage 'http://www.zoom.us' - install 'zoomusInstaller.pkg' + pkg 'zoomusInstaller.pkg' uninstall :files => [ '/Applications/zoom.us.app', "#{ENV['HOME']}/Desktop/Zoom" diff --git a/Casks/zooom.rb b/Casks/zooom.rb index 82126ef1529d3..6512f9203d991 100644 --- a/Casks/zooom.rb +++ b/Casks/zooom.rb @@ -5,7 +5,7 @@ class Zooom < Cask url 'http://software.coderage-software.com/zooom/Zooom_2.6.0.dmg' homepage 'http://coderage-software.com/zooom' - install 'Zooom2.pkg' + pkg 'Zooom2.pkg' caveats do os_version_only '10.10', '10.9' end