From b58fc49984d747ef558a51ec5edcb21768f37133 Mon Sep 17 00:00:00 2001 From: Josh Hagins Date: Sat, 16 Jan 2016 23:46:12 -0500 Subject: [PATCH 1/2] Use travis setup from main repo --- .travis.yml | 83 +++++++++++++++++-------------------- ci/travis/README.md | 5 +++ ci/travis/before_install.sh | 67 ++++++++++++++++++++++++++++++ ci/travis/before_script.sh | 21 ++++++++++ ci/travis/helpers.sh | 55 ++++++++++++++++++++++++ ci/travis/install.sh | 21 ++++++++++ ci/travis/script.sh | 22 ++++++++++ test/layout_test.rb | 1 + 8 files changed, 230 insertions(+), 45 deletions(-) create mode 100644 ci/travis/README.md create mode 100644 ci/travis/before_install.sh create mode 100644 ci/travis/before_script.sh create mode 100644 ci/travis/helpers.sh create mode 100644 ci/travis/install.sh create mode 100644 ci/travis/script.sh diff --git a/.travis.yml b/.travis.yml index ddaeed2ce..fceebc5c8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,64 +1,52 @@ language: objective-c -# todo -# -# test with Ruby 2.1, but allow failure -# +sudo: false -# "Current" is dependent on OS X release. At the time of writing, it -# is always either 1.8 or 2.0 env: - matrix: - - CASK_RUBY_TEST_VERSION="2.0" - - CASK_RUBY_TEST_VERSION="Current" + global: + - LANG=en_US.UTF-8 + - LANGUAGE=en_US.UTF-8 + - LC_ALL=en_US.UTF-8 -# permit "Current" to fail without affecting our badge matrix: - allow_failures: - - env: CASK_RUBY_TEST_VERSION="Current" + include: + - env: OSX=10.11 HOMEBREW_RUBY=2.0.0 + os: osx + osx_image: xcode7.2 + rvm: system + - env: OSX=10.10 HOMEBREW_RUBY=2.0.0 + os: osx + osx_image: xcode7.1 + rvm: system + - env: OSX=10.9 HOMEBREW_RUBY=2.0.0 + os: osx + osx_image: beta-xcode6.2 + rvm: system fast_finish: true -# before_install steps -# * turn off RVM -# * set PATH according to env matrix -# * update Homebrew -# * informational feedback +branches: + only: + - master + +cache: + directories: + - /usr/local + - $HOME/.gem + before_install: - - rvm use system - - export PATH="/System/Library/Frameworks/Ruby.framework/Versions/${CASK_RUBY_TEST_VERSION}/usr/bin":"$PATH" - - brew update - - printenv PATH - - /usr/bin/which ruby - - ruby --version - - /usr/bin/which rake - - rake --version - - echo ls_ruby_bindir; ls "/System/Library/Frameworks/Ruby.framework/Versions/${CASK_RUBY_TEST_VERSION}/usr/bin" + - . ci/travis/before_install.sh -# install steps -# * bundler gem -# * Ruby gems required for brew-cask install: - - echo gem_install_bundler; sudo "/System/Library/Frameworks/Ruby.framework/Versions/${CASK_RUBY_TEST_VERSION}/usr/bin/gem" install bundler --bindir="/System/Library/Frameworks/Ruby.framework/Versions/${CASK_RUBY_TEST_VERSION}/usr/bin" - - echo bundle; sudo "/System/Library/Frameworks/Ruby.framework/Versions/${CASK_RUBY_TEST_VERSION}/usr/bin/bundle" --system - - brew install caskroom/cask/brew-cask + - . ci/travis/install.sh -# informational feedback before_script: - - printenv PATH - - /usr/bin/which ruby - - ruby --version - - /usr/bin/which bundle - - bundle --version - - /usr/bin/which rake - - rake --version - - echo ls_ruby_bindir; ls "/System/Library/Frameworks/Ruby.framework/Versions/${CASK_RUBY_TEST_VERSION}/usr/bin" + - . ci/travis/before_script.sh -# the test itself -# path-quoting is different here due to YAML constraints script: - - /System/Library/Frameworks/Ruby.framework/Versions/"${CASK_RUBY_TEST_VERSION}"/usr/bin/bundle exec "/System/Library/Frameworks/Ruby.framework/Versions/${CASK_RUBY_TEST_VERSION}/usr/bin/rake" test + - . ci/travis/script.sh notifications: + email: false irc: channels: - "chat.freenode.net#homebrew-cask" @@ -66,4 +54,9 @@ notifications: - "(%{repository_name}) %{build_number}: %{branch}@%{commit} %{author} -> %{message} %{build_url}" use_notice: true skip_join: true - email: false + webhooks: + urls: + - "https://webhooks.gitter.im/e/712d699360b239db14a5" + on_success: change + on_failure: always + on_start: never diff --git a/ci/travis/README.md b/ci/travis/README.md new file mode 100644 index 000000000..9c1050bc6 --- /dev/null +++ b/ci/travis/README.md @@ -0,0 +1,5 @@ +## Travis-CI Scripts + +The bash scripts in this directory are run only in Travis-CI, and are placed here to help simplify the [`.travis.yml`](../../.travis.yml) configuration file. + +These scripts are not meant to be run locally by users or developers of Homebrew-Cask. diff --git a/ci/travis/before_install.sh b/ci/travis/before_install.sh new file mode 100644 index 000000000..9fbba1c77 --- /dev/null +++ b/ci/travis/before_install.sh @@ -0,0 +1,67 @@ +#!/usr/bin/env bash +# +# before_install.sh +# +# This file is meant to be sourced during the `before_install` phase of the +# Travis build. Do not attempt to source or run it locally. +# +# shellcheck disable=SC1090 +. "${TRAVIS_BUILD_DIR}/ci/travis/helpers.sh" + +enter_build_step + +header 'Running before_install.sh...' + +# unset rvm hook functions +run unset -f cd gem + +# print all travis-defined environment variables +run 'env | sort' + +# see https://github.com/travis-ci/travis-ci/issues/2666 +run export BRANCH_COMMIT="${TRAVIS_COMMIT_RANGE##*.}" +run export TARGET_COMMIT="${TRAVIS_COMMIT_RANGE%%.*}" +# shellcheck disable=SC2016 +run 'MERGE_BASE="$(git merge-base "${BRANCH_COMMIT}" "${TARGET_COMMIT}")"' +run export MERGE_BASE="${MERGE_BASE}" +run export TRAVIS_COMMIT_RANGE="${MERGE_BASE}...${BRANCH_COMMIT}" + +# print detailed OSX version info +run sw_vers + +# capture system ruby and gem locations +run export SYSTEM_RUBY_HOME="/System/Library/Frameworks/Ruby.framework/Versions/${HOMEBREW_RUBY%.*}" +run export SYSTEM_RUBY_BINDIR="${SYSTEM_RUBY_HOME}/usr/bin" +run export SYSTEM_GEM_HOME="${SYSTEM_RUBY_HOME}/usr/lib/ruby/gems/${HOMEBREW_RUBY}" +run export SYSTEM_GEM_BINDIR="${SYSTEM_GEM_HOME}/bin" + +# capture user gem locations +run export GEM_HOME="$HOME/.gem/ruby/${HOMEBREW_RUBY}" +run export GEM_BINDIR="${GEM_HOME}/bin" + +# ensure that the gems we install are used before system gems +run export GEM_PATH="${GEM_HOME}:${SYSTEM_GEM_HOME}" +run export PATH="${GEM_BINDIR}:${SYSTEM_GEM_BINDIR}:${SYSTEM_RUBY_BINDIR}:$PATH" + +# ensure that brew uses the ruby we want it to +run export HOMEBREW_RUBY_PATH="${SYSTEM_RUBY_BINDIR}/ruby" + +run which ruby +run ruby --version + +run which gem +run gem --version + +run brew update + +# ensure that we are the only brew-cask available +run brew uninstall --force brew-cask + +# mirror the repo as a tap, then run the build from there +run export CASK_TAP_DIR='/usr/local/Library/Taps/caskroom/homebrew-versions' +run mkdir -p "${CASK_TAP_DIR}" +run rsync -az --delete "${TRAVIS_BUILD_DIR}/" "${CASK_TAP_DIR}/" +run export TRAVIS_BUILD_DIR="${CASK_TAP_DIR}" +run cd "${CASK_TAP_DIR}" || exit 1 + +exit_build_step diff --git a/ci/travis/before_script.sh b/ci/travis/before_script.sh new file mode 100644 index 000000000..83c9c46b6 --- /dev/null +++ b/ci/travis/before_script.sh @@ -0,0 +1,21 @@ +#!/usr/bin/env bash +# +# before_script.sh +# +# This file is meant to be sourced during the `before_script` phase of the +# Travis build. Do not attempt to source or run it locally. +# +# shellcheck disable=SC1090 +. "${TRAVIS_BUILD_DIR}/ci/travis/helpers.sh" + +enter_build_step + +header 'Running before_script.sh...' + +run which bundle +run bundle --version + +run which rake +run rake --version + +exit_build_step diff --git a/ci/travis/helpers.sh b/ci/travis/helpers.sh new file mode 100644 index 000000000..934ce3200 --- /dev/null +++ b/ci/travis/helpers.sh @@ -0,0 +1,55 @@ +#!/usr/bin/env bash +# +# helpers.sh +# +# Helper functions for Travis build scripts. +# + +# force strict error checking +set -o errexit +set -o pipefail + +# enable extended globbing syntax +shopt -s extglob + +CYAN='\033[0;36m' +MAGENTA='\033[1;35m' +NC='\033[0m' # no color + +# log command before running and add a blank line +run () { + echo -e "${MAGENTA}>>>${NC} $*" + eval "$*" + local retval=$? + echo + return $retval +} + +# print args as a cyan header +header () { + echo + echo -e "${CYAN}$*${NC}" + echo +} + +# disallow unbound variables during build step +enter_build_step () { + set -o nounset +} + +# allow unbound variables so Travis doesn't get mad at us +exit_build_step () { + set +o nounset +} + +modified_cask_files () { + if [[ -z "${MODIFIED_CASK_FILES+defined}" ]]; then + MODIFIED_CASK_FILES="$(git diff --name-only --diff-filter=AM "${TRAVIS_COMMIT_RANGE}" -- Casks/*.rb)" + export MODIFIED_CASK_FILES + fi + echo "${MODIFIED_CASK_FILES}" +} + +any_casks_modified () { + [[ -n "$(modified_cask_files)" ]] +} diff --git a/ci/travis/install.sh b/ci/travis/install.sh new file mode 100644 index 000000000..0b08c6dfd --- /dev/null +++ b/ci/travis/install.sh @@ -0,0 +1,21 @@ +#!/usr/bin/env bash +# +# install.sh +# +# This file is meant to be sourced during the `install` phase of the Travis +# build. Do not attempt to source or run it locally. +# +# shellcheck disable=SC1090 +. "${TRAVIS_BUILD_DIR}/ci/travis/helpers.sh" + +enter_build_step + +header 'Running install.sh...' + +# install bundler and project dependencies in $GEM_HOME +run gem install --no-ri --no-rdoc bundler +run which bundle +run bundle --version +run bundle install --path="${GEM_HOME%/*/*}" + +exit_build_step diff --git a/ci/travis/script.sh b/ci/travis/script.sh new file mode 100644 index 000000000..f86ad5784 --- /dev/null +++ b/ci/travis/script.sh @@ -0,0 +1,22 @@ +#!/usr/bin/env bash +# +# script.sh +# +# This file is meant to be sourced during the `script` phase of the Travis +# build. Do not attempt to source or run it locally. +# +# shellcheck disable=SC1090 +. "${TRAVIS_BUILD_DIR}/ci/travis/helpers.sh" + +enter_build_step + +header 'Running script.sh...' + +if any_casks_modified; then + modified_casks=($(modified_cask_files)) + run brew cask style "${modified_casks[@]}" +fi + +run bundle exec rake test + +exit_build_step diff --git a/test/layout_test.rb b/test/layout_test.rb index abe605662..575117d3b 100644 --- a/test/layout_test.rb +++ b/test/layout_test.rb @@ -24,6 +24,7 @@ describe "Repo layout" do TOPLEVEL_DIRS = %w{ .git Casks + ci developer spec test From 68a7e21bef2948a7f9ef5643f343ba5964585c03 Mon Sep 17 00:00:00 2001 From: Josh Hagins Date: Sun, 17 Jan 2016 12:03:36 -0500 Subject: [PATCH 2/2] Fix all casks with brew cask style --fix --- Casks/1password-beta.rb | 8 +- Casks/adium-beta.rb | 6 +- Casks/adobe-design-standard-cs6-de.rb | 4 +- Casks/adobe-design-standard-cs6-es.rb | 4 +- Casks/adobe-design-standard-cs6-fr.rb | 4 +- Casks/adobe-design-standard-cs6-it.rb | 4 +- Casks/adobe-design-standard-cs6-ja.rb | 4 +- Casks/adobe-design-standard-cs6-nl.rb | 4 +- Casks/adobe-design-standard-cs6.rb | 4 +- Casks/adobe-design-web-premium-cs6-de.rb | 4 +- Casks/adobe-design-web-premium-cs6-es.rb | 4 +- Casks/adobe-design-web-premium-cs6-fr.rb | 4 +- Casks/adobe-design-web-premium-cs6-it.rb | 4 +- Casks/adobe-design-web-premium-cs6-ja.rb | 4 +- Casks/adobe-design-web-premium-cs6-nl.rb | 4 +- Casks/adobe-design-web-premium-cs6.rb | 4 +- Casks/adobe-digital-editions2.rb | 6 +- Casks/adobe-illustrator-cc-de.rb | 6 +- Casks/adobe-illustrator-cc-es.rb | 6 +- Casks/adobe-illustrator-cc-fr.rb | 6 +- Casks/adobe-illustrator-cc-it.rb | 6 +- Casks/adobe-illustrator-cc-ja.rb | 6 +- Casks/adobe-illustrator-cc-nl.rb | 6 +- Casks/adobe-indesign-cc-de.rb | 6 +- Casks/adobe-indesign-cc-es.rb | 6 +- Casks/adobe-indesign-cc-fr.rb | 6 +- Casks/adobe-indesign-cc-it.rb | 6 +- Casks/adobe-indesign-cc-ja.rb | 6 +- Casks/adobe-indesign-cc-nl.rb | 6 +- Casks/adobe-master-collection-cs6-de.rb | 4 +- Casks/adobe-master-collection-cs6-es.rb | 4 +- Casks/adobe-master-collection-cs6-fr.rb | 4 +- Casks/adobe-master-collection-cs6-it.rb | 4 +- Casks/adobe-master-collection-cs6-ja.rb | 4 +- Casks/adobe-master-collection-cs6-nl.rb | 4 +- Casks/adobe-master-collection-cs6.rb | 4 +- Casks/adobe-photoshop-cc-de.rb | 7 +- Casks/adobe-photoshop-cc-es.rb | 7 +- Casks/adobe-photoshop-cc-fr.rb | 7 +- Casks/adobe-photoshop-cc-it.rb | 7 +- Casks/adobe-photoshop-cc-ja.rb | 7 +- Casks/adobe-photoshop-cc-nl.rb | 7 +- Casks/adobe-photoshop-cs5.rb | 8 +- Casks/adobe-photoshop-lightroom571.rb | 11 +-- Casks/adobe-photoshop-lightroom600.rb | 13 +-- Casks/adobe-production-premium-cs6-de.rb | 4 +- Casks/adobe-production-premium-cs6-es.rb | 4 +- Casks/adobe-production-premium-cs6-fr.rb | 4 +- Casks/adobe-production-premium-cs6-it.rb | 4 +- Casks/adobe-production-premium-cs6-ja.rb | 4 +- Casks/adobe-production-premium-cs6.rb | 4 +- Casks/adobe-reader-de.rb | 10 ++- Casks/adobe-reader-fr.rb | 10 ++- Casks/adobe-reader-ja.rb | 2 + Casks/adobe-reader-pl.rb | 9 ++- Casks/adobe-reader-pt-br.rb | 8 +- Casks/airmail-beta.rb | 2 +- Casks/anaconda2.rb | 11 ++- Casks/android-studio-canary.rb | 6 +- Casks/appcode-eap.rb | 14 ++-- Casks/atom-beta.rb | 14 ++-- Casks/audio-hijack-pro.rb | 12 +-- Casks/battle-net-zh-cn.rb | 10 +-- Casks/camtwist-beta.rb | 4 +- Casks/charles-applejava.rb | 6 +- Casks/charles-beta-applejava.rb | 6 +- Casks/charles-beta.rb | 6 +- Casks/clion-eap.rb | 12 +-- Casks/clipmenu-alpha.rb | 4 +- Casks/clipmenu-dev.rb | 4 +- Casks/dropbox-experimental.rb | 4 +- Casks/earlybird.rb | 2 +- Casks/firefox-beta-de.rb | 4 +- Casks/firefox-beta-en-gb.rb | 4 +- Casks/firefox-beta-ja.rb | 4 +- Casks/firefox-beta-ru.rb | 4 +- Casks/firefox-beta-uk.rb | 4 +- Casks/firefox-beta-zh-cn.rb | 4 +- Casks/firefox-beta.rb | 4 +- Casks/firefox-de.rb | 4 +- Casks/firefox-esr-ru.rb | 6 +- Casks/firefox-esr-uk.rb | 6 +- Casks/firefox-esr-zh-cn.rb | 4 +- Casks/firefox-esr.rb | 4 +- Casks/firefox-fr.rb | 4 +- Casks/firefox-gl.rb | 4 +- Casks/firefox-it.rb | 4 +- Casks/firefox-ja.rb | 4 +- Casks/firefox-nightly-ja.rb | 4 +- Casks/firefox-nightly.rb | 4 +- Casks/firefox-nl.rb | 4 +- Casks/firefox-pl.rb | 4 +- Casks/firefox-pt-br.rb | 4 +- Casks/firefox-ru.rb | 4 +- Casks/firefox-uk.rb | 4 +- Casks/firefox-zh-cn.rb | 4 +- Casks/firefox-zh-tw.rb | 4 +- Casks/firefoxdeveloperedition-ja.rb | 2 +- Casks/firefoxdeveloperedition.rb | 2 +- Casks/flux-beta.rb | 4 +- Casks/google-chrome-beta.rb | 20 ++--- Casks/google-chrome-canary.rb | 20 ++--- Casks/google-chrome-dev.rb | 20 ++--- Casks/google-japanese-ime-dev.rb | 8 +- Casks/handbrakecli-nightly.rb | 4 +- Casks/hearthstone-en-gb.rb | 2 +- Casks/hearthstone-ko.rb | 2 +- Casks/intellij-idea-ce-eap.rb | 12 +-- Casks/intellij-idea-eap.rb | 10 +-- Casks/java-beta.rb | 31 ++++---- Casks/java6.rb | 2 +- Casks/java7.rb | 33 ++++---- Casks/java9-beta.rb | 31 ++++---- Casks/julia-nightly.rb | 8 +- Casks/kicad-nightly.rb | 2 +- Casks/libreoffice-beta.rb | 4 +- Casks/little-snitch-nightly.rb | 10 +-- Casks/macaw-indigo.rb | 2 +- Casks/macvim-kaoriya.rb | 17 ++-- Casks/microsoft-office-2011.rb | 79 ++++++++++--------- Casks/microsoft-office-de.rb | 79 ++++++++++--------- Casks/microsoft-office-ja.rb | 79 ++++++++++--------- Casks/netbeans-cpp-nightly.rb | 2 +- Casks/omnifocus-beta.rb | 8 +- Casks/omnipresence-beta.rb | 4 +- Casks/openemu-experimental.rb | 52 ++++++------ Casks/opera-beta.rb | 4 +- Casks/opera-developer.rb | 4 +- Casks/parallels10.rb | 5 +- Casks/phpstorm-eap.rb | 13 ++- Casks/pokerstarseu.rb | 4 +- Casks/pycharm-ce-eap.rb | 16 ++-- Casks/pycharm-eap.rb | 16 ++-- Casks/royal-tsx-beta.rb | 2 +- Casks/rstudio-daily.rb | 2 +- Casks/rstudio-preview.rb | 2 +- Casks/rubymine-eap.rb | 12 +-- Casks/scansnap-manager-s1300.rb | 6 +- ...er-s300m-s500m-s510m-fi-5110eoxm-legacy.rb | 32 ++++---- Casks/scansnap-manager-s300m-s510m.rb | 32 ++++---- Casks/scansnap-manager-sv600.rb | 8 +- Casks/sketchup-pro.rb | 6 +- Casks/sublime-text-dev.rb | 12 +-- Casks/sublime-text3.rb | 12 +-- Casks/torbrowser-alpha.rb | 8 +- Casks/torbrowser-ar.rb | 4 +- Casks/torbrowser-cn.rb | 4 +- Casks/torbrowser-de.rb | 4 +- Casks/torbrowser-es.rb | 4 +- Casks/torbrowser-fa.rb | 4 +- Casks/torbrowser-fr.rb | 4 +- Casks/torbrowser-it.rb | 4 +- Casks/torbrowser-ko.rb | 4 +- Casks/torbrowser-nl.rb | 4 +- Casks/torbrowser-pl.rb | 4 +- Casks/torbrowser-pt.rb | 4 +- Casks/torbrowser-ru.rb | 4 +- Casks/torbrowser-tr.rb | 4 +- Casks/torbrowser-vi.rb | 4 +- Casks/tower-beta.rb | 6 +- Casks/transmission-nightly.rb | 10 +-- Casks/tunnelblick-beta.rb | 4 +- Casks/utorrent-beta.rb | 18 ++--- Casks/virtualbox-beta.rb | 2 +- Casks/vmware-fusion6.rb | 4 +- Casks/vmware-fusion7.rb | 12 +-- Casks/webstorm-eap.rb | 12 +-- Casks/weka-dev.rb | 4 +- Casks/wimoweh-beta.rb | 2 +- Casks/xquartz-beta.rb | 23 +++--- 170 files changed, 722 insertions(+), 710 deletions(-) diff --git a/Casks/1password-beta.rb b/Casks/1password-beta.rb index a5d655230..b3980d872 100644 --- a/Casks/1password-beta.rb +++ b/Casks/1password-beta.rb @@ -10,9 +10,9 @@ cask '1password-beta' do app "1Password #{version.to_i}.app" zap :delete => [ - '~/Library/Application Scripts/2BUA8C4S2C.com.agilebits.onepassword-osx-helper', - '~/Library/Containers/2BUA8C4S2C.com.agilebits.onepassword-osx-helper', - '~/Library/Containers/com.agilebits.onepassword-osx', - '~/Library/Group Containers/2BUA8C4S2C.com.agilebits', + '~/Library/Application Scripts/2BUA8C4S2C.com.agilebits.onepassword-osx-helper', + '~/Library/Containers/2BUA8C4S2C.com.agilebits.onepassword-osx-helper', + '~/Library/Containers/com.agilebits.onepassword-osx', + '~/Library/Group Containers/2BUA8C4S2C.com.agilebits', ] end diff --git a/Casks/adium-beta.rb b/Casks/adium-beta.rb index 67a21030b..55e7caf08 100644 --- a/Casks/adium-beta.rb +++ b/Casks/adium-beta.rb @@ -10,8 +10,8 @@ cask 'adium-beta' do app 'Adium.app' zap :delete => [ - '~/Library/Caches/Adium', - '~/Library/Caches/com.adiumX.adiumX', - '~/Library/Preferences/com.adiumX.adiumX.plist', + '~/Library/Caches/Adium', + '~/Library/Caches/com.adiumX.adiumX', + '~/Library/Preferences/com.adiumX.adiumX.plist', ] end diff --git a/Casks/adobe-design-standard-cs6-de.rb b/Casks/adobe-design-standard-cs6-de.rb index 9c3fb74a4..56a96dd11 100644 --- a/Casks/adobe-design-standard-cs6-de.rb +++ b/Casks/adobe-design-standard-cs6-de.rb @@ -9,8 +9,8 @@ cask 'adobe-design-standard-cs6-de' do # https://helpx.adobe.com/x-productkb/policy-pricing/cs6-product-downloads.html url 'http://trials2.adobe.com/AdobeProducts/DSGN/CS6/osx10/DesignStandard_CS6_LS4.dmg', - :user_agent => :fake, - :cookies => { 'MM_TRIALS' => '1234' } + :user_agent => :fake, + :cookies => { 'MM_TRIALS' => '1234' } name 'Adobe CS6 Design Standard' # name must exactly match directory in dmg! homepage 'https://www.adobe.com/mena_en/products/creativesuite.html' license :commercial diff --git a/Casks/adobe-design-standard-cs6-es.rb b/Casks/adobe-design-standard-cs6-es.rb index 73fd624e5..7dd956b61 100644 --- a/Casks/adobe-design-standard-cs6-es.rb +++ b/Casks/adobe-design-standard-cs6-es.rb @@ -9,8 +9,8 @@ cask 'adobe-design-standard-cs6-es' do # https://helpx.adobe.com/x-productkb/policy-pricing/cs6-product-downloads.html url 'http://trials2.adobe.com/AdobeProducts/DSGN/CS6/osx10/DesignStandard_CS6_LS4.dmg', - :user_agent => :fake, - :cookies => { 'MM_TRIALS' => '1234' } + :user_agent => :fake, + :cookies => { 'MM_TRIALS' => '1234' } name 'Adobe CS6 Design Standard' # name must exactly match directory in dmg! homepage 'https://www.adobe.com/mena_en/products/creativesuite.html' license :commercial diff --git a/Casks/adobe-design-standard-cs6-fr.rb b/Casks/adobe-design-standard-cs6-fr.rb index 031ff64b0..dbcf88b4d 100644 --- a/Casks/adobe-design-standard-cs6-fr.rb +++ b/Casks/adobe-design-standard-cs6-fr.rb @@ -9,8 +9,8 @@ cask 'adobe-design-standard-cs6-fr' do # https://helpx.adobe.com/x-productkb/policy-pricing/cs6-product-downloads.html url 'http://trials2.adobe.com/AdobeProducts/DSGN/CS6/osx10/DesignStandard_CS6_LS4.dmg', - :user_agent => :fake, - :cookies => { 'MM_TRIALS' => '1234' } + :user_agent => :fake, + :cookies => { 'MM_TRIALS' => '1234' } name 'Adobe CS6 Design Standard' # name must exactly match directory in dmg! homepage 'https://www.adobe.com/mena_en/products/creativesuite.html' license :commercial diff --git a/Casks/adobe-design-standard-cs6-it.rb b/Casks/adobe-design-standard-cs6-it.rb index b8b0b7b07..4ceab45bc 100644 --- a/Casks/adobe-design-standard-cs6-it.rb +++ b/Casks/adobe-design-standard-cs6-it.rb @@ -9,8 +9,8 @@ cask 'adobe-design-standard-cs6-it' do # https://helpx.adobe.com/x-productkb/policy-pricing/cs6-product-downloads.html url 'http://trials2.adobe.com/AdobeProducts/DSGN/CS6/osx10/DesignStandard_CS6_LS4.dmg', - :user_agent => :fake, - :cookies => { 'MM_TRIALS' => '1234' } + :user_agent => :fake, + :cookies => { 'MM_TRIALS' => '1234' } name 'Adobe CS6 Design Standard' # name must exactly match directory in dmg! homepage 'https://www.adobe.com/mena_en/products/creativesuite.html' license :commercial diff --git a/Casks/adobe-design-standard-cs6-ja.rb b/Casks/adobe-design-standard-cs6-ja.rb index 49a5b1b0a..7c3ccffcc 100644 --- a/Casks/adobe-design-standard-cs6-ja.rb +++ b/Casks/adobe-design-standard-cs6-ja.rb @@ -9,8 +9,8 @@ cask 'adobe-design-standard-cs6-ja' do # https://helpx.adobe.com/x-productkb/policy-pricing/cs6-product-downloads.html url 'http://trials2.adobe.com/AdobeProducts/DSGN/CS6/osx10/DesignStandard_CS6_LS16.dmg', - :user_agent => :fake, - :cookies => { 'MM_TRIALS' => '1234' } + :user_agent => :fake, + :cookies => { 'MM_TRIALS' => '1234' } name 'Adobe CS6 Design Standard' # name must exactly match directory in dmg! homepage 'https://www.adobe.com/mena_en/products/creativesuite.html' license :commercial diff --git a/Casks/adobe-design-standard-cs6-nl.rb b/Casks/adobe-design-standard-cs6-nl.rb index dabd6ede9..750392add 100644 --- a/Casks/adobe-design-standard-cs6-nl.rb +++ b/Casks/adobe-design-standard-cs6-nl.rb @@ -9,8 +9,8 @@ cask 'adobe-design-standard-cs6-nl' do # https://helpx.adobe.com/x-productkb/policy-pricing/cs6-product-downloads.html url 'http://trials2.adobe.com/AdobeProducts/DSGN/CS6/osx10/DesignStandard_CS6_LS4.dmg', - :user_agent => :fake, - :cookies => { 'MM_TRIALS' => '1234' } + :user_agent => :fake, + :cookies => { 'MM_TRIALS' => '1234' } name 'Adobe CS6 Design Standard' # name must exactly match directory in dmg! homepage 'https://www.adobe.com/mena_en/products/creativesuite.html' license :commercial diff --git a/Casks/adobe-design-standard-cs6.rb b/Casks/adobe-design-standard-cs6.rb index 6d892b60f..6bb811f57 100644 --- a/Casks/adobe-design-standard-cs6.rb +++ b/Casks/adobe-design-standard-cs6.rb @@ -9,8 +9,8 @@ cask 'adobe-design-standard-cs6' do # https://helpx.adobe.com/x-productkb/policy-pricing/cs6-product-downloads.html url 'http://trials2.adobe.com/AdobeProducts/DSGN/CS6/osx10/DesignStandard_CS6_LS16.dmg', - :user_agent => :fake, - :cookies => { 'MM_TRIALS' => '1234' } + :user_agent => :fake, + :cookies => { 'MM_TRIALS' => '1234' } name 'Adobe CS6 Design Standard' # name must exactly match directory in dmg! homepage 'https://www.adobe.com/mena_en/products/creativesuite.html' license :commercial diff --git a/Casks/adobe-design-web-premium-cs6-de.rb b/Casks/adobe-design-web-premium-cs6-de.rb index d6905e8ab..30b2a76d6 100644 --- a/Casks/adobe-design-web-premium-cs6-de.rb +++ b/Casks/adobe-design-web-premium-cs6-de.rb @@ -9,8 +9,8 @@ cask 'adobe-design-web-premium-cs6-de' do # https://helpx.adobe.com/x-productkb/policy-pricing/cs6-product-downloads.html url 'http://trials2.adobe.com/AdobeProducts/DSST/CS6/osx10/DesignWebPremium_CS6_LS4.dmg', - :user_agent => :fake, - :cookies => { 'MM_TRIALS' => '1234' } + :user_agent => :fake, + :cookies => { 'MM_TRIALS' => '1234' } name 'Adobe CS6 Design and Web Premium' # name must exactly match directory in dmg! homepage 'https://www.adobe.com/mena_en/products/creativesuite.html' license :commercial diff --git a/Casks/adobe-design-web-premium-cs6-es.rb b/Casks/adobe-design-web-premium-cs6-es.rb index 70f838474..6c5d1392e 100644 --- a/Casks/adobe-design-web-premium-cs6-es.rb +++ b/Casks/adobe-design-web-premium-cs6-es.rb @@ -9,8 +9,8 @@ cask 'adobe-design-web-premium-cs6-es' do # https://helpx.adobe.com/x-productkb/policy-pricing/cs6-product-downloads.html url 'http://trials2.adobe.com/AdobeProducts/DSST/CS6/osx10/DesignWebPremium_CS6_LS4.dmg', - :user_agent => :fake, - :cookies => { 'MM_TRIALS' => '1234' } + :user_agent => :fake, + :cookies => { 'MM_TRIALS' => '1234' } name 'Adobe CS6 Design and Web Premium' # name must exactly match directory in dmg! homepage 'https://www.adobe.com/mena_en/products/creativesuite.html' license :commercial diff --git a/Casks/adobe-design-web-premium-cs6-fr.rb b/Casks/adobe-design-web-premium-cs6-fr.rb index c93ec11b8..bce5e7174 100644 --- a/Casks/adobe-design-web-premium-cs6-fr.rb +++ b/Casks/adobe-design-web-premium-cs6-fr.rb @@ -9,8 +9,8 @@ cask 'adobe-design-web-premium-cs6-fr' do # https://helpx.adobe.com/x-productkb/policy-pricing/cs6-product-downloads.html url 'http://trials2.adobe.com/AdobeProducts/DSST/CS6/osx10/DesignWebPremium_CS6_LS4.dmg', - :user_agent => :fake, - :cookies => { 'MM_TRIALS' => '1234' } + :user_agent => :fake, + :cookies => { 'MM_TRIALS' => '1234' } name 'Adobe CS6 Design and Web Premium' # name must exactly match directory in dmg! homepage 'https://www.adobe.com/mena_en/products/creativesuite.html' license :commercial diff --git a/Casks/adobe-design-web-premium-cs6-it.rb b/Casks/adobe-design-web-premium-cs6-it.rb index 695598d99..0c615c528 100644 --- a/Casks/adobe-design-web-premium-cs6-it.rb +++ b/Casks/adobe-design-web-premium-cs6-it.rb @@ -9,8 +9,8 @@ cask 'adobe-design-web-premium-cs6-it' do # https://helpx.adobe.com/x-productkb/policy-pricing/cs6-product-downloads.html url 'http://trials2.adobe.com/AdobeProducts/DSST/CS6/osx10/DesignWebPremium_CS6_LS4.dmg', - :user_agent => :fake, - :cookies => { 'MM_TRIALS' => '1234' } + :user_agent => :fake, + :cookies => { 'MM_TRIALS' => '1234' } name 'Adobe CS6 Design and Web Premium' # name must exactly match directory in dmg! homepage 'https://www.adobe.com/mena_en/products/creativesuite.html' license :commercial diff --git a/Casks/adobe-design-web-premium-cs6-ja.rb b/Casks/adobe-design-web-premium-cs6-ja.rb index f0153da54..e887a2266 100644 --- a/Casks/adobe-design-web-premium-cs6-ja.rb +++ b/Casks/adobe-design-web-premium-cs6-ja.rb @@ -9,8 +9,8 @@ cask 'adobe-design-web-premium-cs6-ja' do # https://helpx.adobe.com/x-productkb/policy-pricing/cs6-product-downloads.html url 'http://trials2.adobe.com/AdobeProducts/DSST/CS6/osx10/DesignWebPremium_CS6_LS16.dmg', - :user_agent => :fake, - :cookies => { 'MM_TRIALS' => '1234' } + :user_agent => :fake, + :cookies => { 'MM_TRIALS' => '1234' } name 'Adobe CS6 Design and Web Premium' # name must exactly match directory in dmg! homepage 'https://www.adobe.com/mena_en/products/creativesuite.html' license :commercial diff --git a/Casks/adobe-design-web-premium-cs6-nl.rb b/Casks/adobe-design-web-premium-cs6-nl.rb index c8ca3bf11..131a3a07d 100644 --- a/Casks/adobe-design-web-premium-cs6-nl.rb +++ b/Casks/adobe-design-web-premium-cs6-nl.rb @@ -9,8 +9,8 @@ cask 'adobe-design-web-premium-cs6-nl' do # https://helpx.adobe.com/x-productkb/policy-pricing/cs6-product-downloads.html url 'http://trials2.adobe.com/AdobeProducts/DSST/CS6/osx10/DesignWebPremium_CS6_LS4.dmg', - :user_agent => :fake, - :cookies => { 'MM_TRIALS' => '1234' } + :user_agent => :fake, + :cookies => { 'MM_TRIALS' => '1234' } name 'Adobe CS6 Design and Web Premium' # name must exactly match directory in dmg! homepage 'https://www.adobe.com/mena_en/products/creativesuite.html' license :commercial diff --git a/Casks/adobe-design-web-premium-cs6.rb b/Casks/adobe-design-web-premium-cs6.rb index 69e71aa02..bccccffa7 100644 --- a/Casks/adobe-design-web-premium-cs6.rb +++ b/Casks/adobe-design-web-premium-cs6.rb @@ -9,8 +9,8 @@ cask 'adobe-design-web-premium-cs6' do # https://helpx.adobe.com/x-productkb/policy-pricing/cs6-product-downloads.html url 'http://trials2.adobe.com/AdobeProducts/DSST/CS6/osx10/DesignWebPremium_CS6_LS16.dmg', - :user_agent => :fake, - :cookies => { 'MM_TRIALS' => '1234' } + :user_agent => :fake, + :cookies => { 'MM_TRIALS' => '1234' } name 'Adobe CS6 Design and Web Premium' # name must exactly match directory in dmg! homepage 'https://www.adobe.com/mena_en/products/creativesuite.html' license :commercial diff --git a/Casks/adobe-digital-editions2.rb b/Casks/adobe-digital-editions2.rb index 06f30f6be..d34b3954d 100644 --- a/Casks/adobe-digital-editions2.rb +++ b/Casks/adobe-digital-editions2.rb @@ -1,6 +1,6 @@ cask 'adobe-digital-editions2' do version '2.0.1' - sha256 'dcaec3e2cbb2faa7720a2ff06d13af4fe0433cdf991c76eeeed28cb0019b69c0' + sha256 'dcaec3e2cbb2faa7720a2ff06d13af4fe0433cdf991c76eeeed28cb0019b69c0' url 'http://download.adobe.com/pub/adobe/digitaleditions/ADE_2.0_Installer.dmg' name 'Adobe Digital Editions 2.0.1' @@ -9,6 +9,6 @@ cask 'adobe-digital-editions2' do pkg 'Digital Editions 2.0 Installer.pkg', :allow_untrusted => true - uninstall :pkgutil => 'com.adobe.adobedigitaleditions.app', - :delete => '/Applications/Adobe Digital Editions.app' + uninstall :pkgutil => 'com.adobe.adobedigitaleditions.app', + :delete => '/Applications/Adobe Digital Editions.app' end diff --git a/Casks/adobe-illustrator-cc-de.rb b/Casks/adobe-illustrator-cc-de.rb index 0e3d10374..7568b48a8 100644 --- a/Casks/adobe-illustrator-cc-de.rb +++ b/Casks/adobe-illustrator-cc-de.rb @@ -4,11 +4,13 @@ cask 'adobe-illustrator-cc-de' do url 'http://trials3.adobe.com/AdobeProducts/ILST/19/osx10-64/Illustrator_19_LS20.dmg', :user_agent => :fake, - :cookies => { 'MM_TRIALS' => '1234' } + :cookies => { 'MM_TRIALS' => '1234' } name 'Adobe Illustrator CC 2015' homepage 'https://www.adobe.com/products/illustrator.html' license :commercial + conflicts_with :cask => 'adobe-illustrator-cc' + preflight do deployment_xml = "#{staged_path}/Adobe Illustrator CC 2015/Deployment/deployment.xml" @@ -25,6 +27,4 @@ cask 'adobe-illustrator-cc-de' do end uninstall :rmdir => '/Applications/Utilities/Adobe Installers' - - conflicts_with :cask => 'adobe-illustrator-cc' end diff --git a/Casks/adobe-illustrator-cc-es.rb b/Casks/adobe-illustrator-cc-es.rb index 966f01fed..b0bc8a41e 100644 --- a/Casks/adobe-illustrator-cc-es.rb +++ b/Casks/adobe-illustrator-cc-es.rb @@ -4,11 +4,13 @@ cask 'adobe-illustrator-cc-es' do url 'http://trials3.adobe.com/AdobeProducts/ILST/19/osx10-64/Illustrator_19_LS20.dmg', :user_agent => :fake, - :cookies => { 'MM_TRIALS' => '1234' } + :cookies => { 'MM_TRIALS' => '1234' } name 'Adobe Illustrator CC 2015' homepage 'https://www.adobe.com/products/illustrator.html' license :commercial + conflicts_with :cask => 'adobe-illustrator-cc' + preflight do deployment_xml = "#{staged_path}/Adobe Illustrator CC 2015/Deployment/deployment.xml" @@ -25,6 +27,4 @@ cask 'adobe-illustrator-cc-es' do end uninstall :rmdir => '/Applications/Utilities/Adobe Installers' - - conflicts_with :cask => 'adobe-illustrator-cc' end diff --git a/Casks/adobe-illustrator-cc-fr.rb b/Casks/adobe-illustrator-cc-fr.rb index 02686788f..2d1797cbc 100644 --- a/Casks/adobe-illustrator-cc-fr.rb +++ b/Casks/adobe-illustrator-cc-fr.rb @@ -4,11 +4,13 @@ cask 'adobe-illustrator-cc-fr' do url 'http://trials3.adobe.com/AdobeProducts/ILST/19/osx10-64/Illustrator_19_LS20.dmg', :user_agent => :fake, - :cookies => { 'MM_TRIALS' => '1234' } + :cookies => { 'MM_TRIALS' => '1234' } name 'Adobe Illustrator CC 2015' homepage 'https://www.adobe.com/products/illustrator.html' license :commercial + conflicts_with :cask => 'adobe-illustrator-cc' + preflight do deployment_xml = "#{staged_path}/Adobe Illustrator CC 2015/Deployment/deployment.xml" @@ -25,6 +27,4 @@ cask 'adobe-illustrator-cc-fr' do end uninstall :rmdir => '/Applications/Utilities/Adobe Installers' - - conflicts_with :cask => 'adobe-illustrator-cc' end diff --git a/Casks/adobe-illustrator-cc-it.rb b/Casks/adobe-illustrator-cc-it.rb index d8aed171a..92bee3ebd 100644 --- a/Casks/adobe-illustrator-cc-it.rb +++ b/Casks/adobe-illustrator-cc-it.rb @@ -4,11 +4,13 @@ cask 'adobe-illustrator-cc-it' do url 'http://trials3.adobe.com/AdobeProducts/ILST/19/osx10-64/Illustrator_19_LS20.dmg', :user_agent => :fake, - :cookies => { 'MM_TRIALS' => '1234' } + :cookies => { 'MM_TRIALS' => '1234' } name 'Adobe Illustrator CC 2015' homepage 'https://www.adobe.com/products/illustrator.html' license :commercial + conflicts_with :cask => 'adobe-illustrator-cc' + preflight do deployment_xml = "#{staged_path}/Adobe Illustrator CC 2015/Deployment/deployment.xml" @@ -25,6 +27,4 @@ cask 'adobe-illustrator-cc-it' do end uninstall :rmdir => '/Applications/Utilities/Adobe Installers' - - conflicts_with :cask => 'adobe-illustrator-cc' end diff --git a/Casks/adobe-illustrator-cc-ja.rb b/Casks/adobe-illustrator-cc-ja.rb index 6fad161dc..13c96458e 100644 --- a/Casks/adobe-illustrator-cc-ja.rb +++ b/Casks/adobe-illustrator-cc-ja.rb @@ -4,11 +4,13 @@ cask 'adobe-illustrator-cc-ja' do url 'http://trials3.adobe.com/AdobeProducts/ILST/19/osx10-64/Illustrator_19_LS20.dmg', :user_agent => :fake, - :cookies => { 'MM_TRIALS' => '1234' } + :cookies => { 'MM_TRIALS' => '1234' } name 'Adobe Illustrator CC 2015' homepage 'https://www.adobe.com/products/illustrator.html' license :commercial + conflicts_with :cask => 'adobe-illustrator-cc' + preflight do deployment_xml = "#{staged_path}/Adobe Illustrator CC 2015/Deployment/deployment.xml" @@ -25,6 +27,4 @@ cask 'adobe-illustrator-cc-ja' do end uninstall :rmdir => '/Applications/Utilities/Adobe Installers' - - conflicts_with :cask => 'adobe-illustrator-cc' end diff --git a/Casks/adobe-illustrator-cc-nl.rb b/Casks/adobe-illustrator-cc-nl.rb index dcbe33679..14913f7f0 100644 --- a/Casks/adobe-illustrator-cc-nl.rb +++ b/Casks/adobe-illustrator-cc-nl.rb @@ -4,11 +4,13 @@ cask 'adobe-illustrator-cc-nl' do url 'http://trials3.adobe.com/AdobeProducts/ILST/19/osx10-64/Illustrator_19_LS20.dmg', :user_agent => :fake, - :cookies => { 'MM_TRIALS' => '1234' } + :cookies => { 'MM_TRIALS' => '1234' } name 'Adobe Illustrator CC 2015' homepage 'https://www.adobe.com/products/illustrator.html' license :commercial + conflicts_with :cask => 'adobe-illustrator-cc' + preflight do deployment_xml = "#{staged_path}/Adobe Illustrator CC 2015/Deployment/deployment.xml" @@ -25,6 +27,4 @@ cask 'adobe-illustrator-cc-nl' do end uninstall :rmdir => '/Applications/Utilities/Adobe Installers' - - conflicts_with :cask => 'adobe-illustrator-cc' end diff --git a/Casks/adobe-indesign-cc-de.rb b/Casks/adobe-indesign-cc-de.rb index bb94f4e83..8e12b12d3 100644 --- a/Casks/adobe-indesign-cc-de.rb +++ b/Casks/adobe-indesign-cc-de.rb @@ -4,11 +4,13 @@ cask 'adobe-indesign-cc-de' do url 'http://trials3.adobe.com/AdobeProducts/IDSN/11/osx10/InDesign_11_LS20.dmg', :user_agent => :fake, - :cookies => { 'MM_TRIALS' => '1234' } + :cookies => { 'MM_TRIALS' => '1234' } name 'Adobe InDesign CC 2015' homepage 'https://www.adobe.com/products/indesign.html' license :commercial + conflicts_with :cask => 'adobe-indesign-cc' + preflight do deployment_xml = "#{staged_path}/Adobe InDesign CC 2015/deploy/install.xml" @@ -25,6 +27,4 @@ cask 'adobe-indesign-cc-de' do end uninstall :rmdir => '/Applications/Utilities/Adobe Installers' - - conflicts_with :cask => 'adobe-indesign-cc' end diff --git a/Casks/adobe-indesign-cc-es.rb b/Casks/adobe-indesign-cc-es.rb index 66a382457..ad3509be9 100644 --- a/Casks/adobe-indesign-cc-es.rb +++ b/Casks/adobe-indesign-cc-es.rb @@ -4,11 +4,13 @@ cask 'adobe-indesign-cc-es' do url 'http://trials3.adobe.com/AdobeProducts/IDSN/11/osx10/InDesign_11_LS20.dmg', :user_agent => :fake, - :cookies => { 'MM_TRIALS' => '1234' } + :cookies => { 'MM_TRIALS' => '1234' } name 'Adobe InDesign CC 2015' homepage 'https://www.adobe.com/products/indesign.html' license :commercial + conflicts_with :cask => 'adobe-indesign-cc' + preflight do deployment_xml = "#{staged_path}/Adobe InDesign CC 2015/deploy/install.xml" @@ -25,6 +27,4 @@ cask 'adobe-indesign-cc-es' do end uninstall :rmdir => '/Applications/Utilities/Adobe Installers' - - conflicts_with :cask => 'adobe-indesign-cc' end diff --git a/Casks/adobe-indesign-cc-fr.rb b/Casks/adobe-indesign-cc-fr.rb index c9656f4a3..e42f675a5 100644 --- a/Casks/adobe-indesign-cc-fr.rb +++ b/Casks/adobe-indesign-cc-fr.rb @@ -4,11 +4,13 @@ cask 'adobe-indesign-cc-fr' do url 'http://trials3.adobe.com/AdobeProducts/IDSN/11/osx10/InDesign_11_LS20.dmg', :user_agent => :fake, - :cookies => { 'MM_TRIALS' => '1234' } + :cookies => { 'MM_TRIALS' => '1234' } name 'Adobe InDesign CC 2015' homepage 'https://www.adobe.com/products/indesign.html' license :commercial + conflicts_with :cask => 'adobe-indesign-cc' + preflight do deployment_xml = "#{staged_path}/Adobe InDesign CC 2015/deploy/install.xml" @@ -25,6 +27,4 @@ cask 'adobe-indesign-cc-fr' do end uninstall :rmdir => '/Applications/Utilities/Adobe Installers' - - conflicts_with :cask => 'adobe-indesign-cc' end diff --git a/Casks/adobe-indesign-cc-it.rb b/Casks/adobe-indesign-cc-it.rb index bbb2d5b81..0c29b31c0 100644 --- a/Casks/adobe-indesign-cc-it.rb +++ b/Casks/adobe-indesign-cc-it.rb @@ -4,11 +4,13 @@ cask 'adobe-indesign-cc-it' do url 'http://trials3.adobe.com/AdobeProducts/IDSN/11/osx10/InDesign_11_LS20.dmg', :user_agent => :fake, - :cookies => { 'MM_TRIALS' => '1234' } + :cookies => { 'MM_TRIALS' => '1234' } name 'Adobe InDesign CC 2015' homepage 'https://www.adobe.com/products/indesign.html' license :commercial + conflicts_with :cask => 'adobe-indesign-cc' + preflight do deployment_xml = "#{staged_path}/Adobe InDesign CC 2015/deploy/install.xml" @@ -25,6 +27,4 @@ cask 'adobe-indesign-cc-it' do end uninstall :rmdir => '/Applications/Utilities/Adobe Installers' - - conflicts_with :cask => 'adobe-indesign-cc' end diff --git a/Casks/adobe-indesign-cc-ja.rb b/Casks/adobe-indesign-cc-ja.rb index f0bd00bcf..eb5de44e4 100644 --- a/Casks/adobe-indesign-cc-ja.rb +++ b/Casks/adobe-indesign-cc-ja.rb @@ -4,11 +4,13 @@ cask 'adobe-indesign-cc-ja' do url 'http://trials3.adobe.com/AdobeProducts/IDSN/11/osx10/InDesign_11_LS20.dmg', :user_agent => :fake, - :cookies => { 'MM_TRIALS' => '1234' } + :cookies => { 'MM_TRIALS' => '1234' } name 'Adobe InDesign CC 2015' homepage 'https://www.adobe.com/products/indesign.html' license :commercial + conflicts_with :cask => 'adobe-indesign-cc' + preflight do deployment_xml = "#{staged_path}/Adobe InDesign CC 2015/deploy/install.xml" @@ -25,6 +27,4 @@ cask 'adobe-indesign-cc-ja' do end uninstall :rmdir => '/Applications/Utilities/Adobe Installers' - - conflicts_with :cask => 'adobe-indesign-cc' end diff --git a/Casks/adobe-indesign-cc-nl.rb b/Casks/adobe-indesign-cc-nl.rb index 83a7075ed..b568c705c 100644 --- a/Casks/adobe-indesign-cc-nl.rb +++ b/Casks/adobe-indesign-cc-nl.rb @@ -4,11 +4,13 @@ cask 'adobe-indesign-cc-nl' do url 'http://trials3.adobe.com/AdobeProducts/IDSN/11/osx10/InDesign_11_LS20.dmg', :user_agent => :fake, - :cookies => { 'MM_TRIALS' => '1234' } + :cookies => { 'MM_TRIALS' => '1234' } name 'Adobe InDesign CC 2015' homepage 'https://www.adobe.com/products/indesign.html' license :commercial + conflicts_with :cask => 'adobe-indesign-cc' + preflight do deployment_xml = "#{staged_path}/Adobe InDesign CC 2015/deploy/install.xml" @@ -25,6 +27,4 @@ cask 'adobe-indesign-cc-nl' do end uninstall :rmdir => '/Applications/Utilities/Adobe Installers' - - conflicts_with :cask => 'adobe-indesign-cc' end diff --git a/Casks/adobe-master-collection-cs6-de.rb b/Casks/adobe-master-collection-cs6-de.rb index 22c2f6043..e8d0f68e6 100644 --- a/Casks/adobe-master-collection-cs6-de.rb +++ b/Casks/adobe-master-collection-cs6-de.rb @@ -9,8 +9,8 @@ cask 'adobe-master-collection-cs6-de' do # https://helpx.adobe.com/x-productkb/policy-pricing/cs6-product-downloads.html url 'http://trials2.adobe.com/AdobeProducts/STAM/CS6/osx10/MasterCollection_CS6_LS4.dmg', - :user_agent => :fake, - :cookies => { 'MM_TRIALS' => '1234' } + :user_agent => :fake, + :cookies => { 'MM_TRIALS' => '1234' } name 'Adobe CS6 Master Collection' # name must exactly match directory in dmg! homepage 'https://www.adobe.com/mena_en/products/creativesuite.html' license :commercial diff --git a/Casks/adobe-master-collection-cs6-es.rb b/Casks/adobe-master-collection-cs6-es.rb index 57bc3b374..908ae591f 100644 --- a/Casks/adobe-master-collection-cs6-es.rb +++ b/Casks/adobe-master-collection-cs6-es.rb @@ -9,8 +9,8 @@ cask 'adobe-master-collection-cs6-es' do # https://helpx.adobe.com/x-productkb/policy-pricing/cs6-product-downloads.html url 'http://trials2.adobe.com/AdobeProducts/STAM/CS6/osx10/MasterCollection_CS6_LS4.dmg', - :user_agent => :fake, - :cookies => { 'MM_TRIALS' => '1234' } + :user_agent => :fake, + :cookies => { 'MM_TRIALS' => '1234' } name 'Adobe CS6 Master Collection' # name must exactly match directory in dmg! homepage 'https://www.adobe.com/mena_en/products/creativesuite.html' license :commercial diff --git a/Casks/adobe-master-collection-cs6-fr.rb b/Casks/adobe-master-collection-cs6-fr.rb index b44d85649..a1a72ae9f 100644 --- a/Casks/adobe-master-collection-cs6-fr.rb +++ b/Casks/adobe-master-collection-cs6-fr.rb @@ -9,8 +9,8 @@ cask 'adobe-master-collection-cs6-fr' do # https://helpx.adobe.com/x-productkb/policy-pricing/cs6-product-downloads.html url 'http://trials2.adobe.com/AdobeProducts/STAM/CS6/osx10/MasterCollection_CS6_LS4.dmg', - :user_agent => :fake, - :cookies => { 'MM_TRIALS' => '1234' } + :user_agent => :fake, + :cookies => { 'MM_TRIALS' => '1234' } name 'Adobe CS6 Master Collection' # name must exactly match directory in dmg! homepage 'https://www.adobe.com/mena_en/products/creativesuite.html' license :commercial diff --git a/Casks/adobe-master-collection-cs6-it.rb b/Casks/adobe-master-collection-cs6-it.rb index 2431e6959..6a80ce78b 100644 --- a/Casks/adobe-master-collection-cs6-it.rb +++ b/Casks/adobe-master-collection-cs6-it.rb @@ -9,8 +9,8 @@ cask 'adobe-master-collection-cs6-it' do # https://helpx.adobe.com/x-productkb/policy-pricing/cs6-product-downloads.html url 'http://trials2.adobe.com/AdobeProducts/STAM/CS6/osx10/MasterCollection_CS6_LS4.dmg', - :user_agent => :fake, - :cookies => { 'MM_TRIALS' => '1234' } + :user_agent => :fake, + :cookies => { 'MM_TRIALS' => '1234' } name 'Adobe CS6 Master Collection' # name must exactly match directory in dmg! homepage 'https://www.adobe.com/mena_en/products/creativesuite.html' license :commercial diff --git a/Casks/adobe-master-collection-cs6-ja.rb b/Casks/adobe-master-collection-cs6-ja.rb index 99222c560..c32701dd2 100644 --- a/Casks/adobe-master-collection-cs6-ja.rb +++ b/Casks/adobe-master-collection-cs6-ja.rb @@ -9,8 +9,8 @@ cask 'adobe-master-collection-cs6-ja' do # https://helpx.adobe.com/x-productkb/policy-pricing/cs6-product-downloads.html url 'http://trials2.adobe.com/AdobeProducts/STAM/CS6/osx10/MasterCollection_CS6_LS16.dmg', - :user_agent => :fake, - :cookies => { 'MM_TRIALS' => '1234' } + :user_agent => :fake, + :cookies => { 'MM_TRIALS' => '1234' } name 'Adobe CS6 Master Collection' # name must exactly match directory in dmg! homepage 'https://www.adobe.com/mena_en/products/creativesuite.html' license :commercial diff --git a/Casks/adobe-master-collection-cs6-nl.rb b/Casks/adobe-master-collection-cs6-nl.rb index d0a151c98..03810b893 100644 --- a/Casks/adobe-master-collection-cs6-nl.rb +++ b/Casks/adobe-master-collection-cs6-nl.rb @@ -9,8 +9,8 @@ cask 'adobe-master-collection-cs6-nl' do # https://helpx.adobe.com/x-productkb/policy-pricing/cs6-product-downloads.html url 'http://trials2.adobe.com/AdobeProducts/STAM/CS6/osx10/MasterCollection_CS6_LS4.dmg', - :user_agent => :fake, - :cookies => { 'MM_TRIALS' => '1234' } + :user_agent => :fake, + :cookies => { 'MM_TRIALS' => '1234' } name 'Adobe CS6 Master Collection' # name must exactly match directory in dmg! homepage 'https://www.adobe.com/mena_en/products/creativesuite.html' license :commercial diff --git a/Casks/adobe-master-collection-cs6.rb b/Casks/adobe-master-collection-cs6.rb index 2691fd476..74bddd4bf 100644 --- a/Casks/adobe-master-collection-cs6.rb +++ b/Casks/adobe-master-collection-cs6.rb @@ -9,8 +9,8 @@ cask 'adobe-master-collection-cs6' do # https://helpx.adobe.com/x-productkb/policy-pricing/cs6-product-downloads.html url 'http://trials2.adobe.com/AdobeProducts/STAM/CS6/osx10/MasterCollection_CS6_LS16.dmg', - :user_agent => :fake, - :cookies => { 'MM_TRIALS' => '1234' } + :user_agent => :fake, + :cookies => { 'MM_TRIALS' => '1234' } name 'Adobe CS6 Master Collection' # name must exactly match directory in dmg! homepage 'https://www.adobe.com/mena_en/products/creativesuite.html' license :commercial diff --git a/Casks/adobe-photoshop-cc-de.rb b/Casks/adobe-photoshop-cc-de.rb index 7a1080129..3eaa98c09 100644 --- a/Casks/adobe-photoshop-cc-de.rb +++ b/Casks/adobe-photoshop-cc-de.rb @@ -4,11 +4,13 @@ cask 'adobe-photoshop-cc-de' do url 'http://trials3.adobe.com/AdobeProducts/PHSP/16/osx10/Photoshop_16_LS20.dmg', :user_agent => :fake, - :cookies => { 'MM_TRIALS' => '1234' } + :cookies => { 'MM_TRIALS' => '1234' } name 'Adobe Photoshop CC 2015' homepage 'https://www.adobe.com/products/photoshop.html' license :commercial + conflicts_with :cask => 'adobe-photoshop-cc' + preflight do file = File.open "#{staged_path}/uninstall.xml", 'w' file.puts ' @@ -26,7 +28,6 @@ cask 'adobe-photoshop-cc-de' do file.close system '/usr/bin/sudo', '-E', '--', "#{staged_path}/Adobe Photoshop CC 2015/Install.app/Contents/MacOS/Install", '--mode=silent', "--deploymentFile=#{staged_path}/Adobe\ Photoshop\ CC\ 2015/Deployment/de_DE_Deployment.xml" - end uninstall_preflight do @@ -34,6 +35,4 @@ cask 'adobe-photoshop-cc-de' do end uninstall :rmdir => '/Applications/Utilities/Adobe Installers' - - conflicts_with :cask => 'adobe-photoshop-cc' end diff --git a/Casks/adobe-photoshop-cc-es.rb b/Casks/adobe-photoshop-cc-es.rb index 757c760af..658caf65d 100644 --- a/Casks/adobe-photoshop-cc-es.rb +++ b/Casks/adobe-photoshop-cc-es.rb @@ -4,11 +4,13 @@ cask 'adobe-photoshop-cc-es' do url 'http://trials3.adobe.com/AdobeProducts/PHSP/16/osx10/Photoshop_16_LS20.dmg', :user_agent => :fake, - :cookies => { 'MM_TRIALS' => '1234' } + :cookies => { 'MM_TRIALS' => '1234' } name 'Adobe Photoshop CC 2015' homepage 'https://www.adobe.com/products/photoshop.html' license :commercial + conflicts_with :cask => 'adobe-photoshop-cc' + preflight do file = File.open "#{staged_path}/uninstall.xml", 'w' file.puts ' @@ -26,7 +28,6 @@ cask 'adobe-photoshop-cc-es' do file.close system '/usr/bin/sudo', '-E', '--', "#{staged_path}/Adobe Photoshop CC 2015/Install.app/Contents/MacOS/Install", '--mode=silent', "--deploymentFile=#{staged_path}/Adobe\ Photoshop\ CC\ 2015/Deployment/es_ES_Deployment.xml" - end uninstall_preflight do @@ -34,6 +35,4 @@ cask 'adobe-photoshop-cc-es' do end uninstall :rmdir => '/Applications/Utilities/Adobe Installers' - - conflicts_with :cask => 'adobe-photoshop-cc' end diff --git a/Casks/adobe-photoshop-cc-fr.rb b/Casks/adobe-photoshop-cc-fr.rb index 62bb0d716..88b4a5a44 100644 --- a/Casks/adobe-photoshop-cc-fr.rb +++ b/Casks/adobe-photoshop-cc-fr.rb @@ -4,11 +4,13 @@ cask 'adobe-photoshop-cc-fr' do url 'http://trials3.adobe.com/AdobeProducts/PHSP/16/osx10/Photoshop_16_LS20.dmg', :user_agent => :fake, - :cookies => { 'MM_TRIALS' => '1234' } + :cookies => { 'MM_TRIALS' => '1234' } name 'Adobe Photoshop CC 2015' homepage 'https://www.adobe.com/products/photoshop.html' license :commercial + conflicts_with :cask => 'adobe-photoshop-cc' + preflight do file = File.open "#{staged_path}/uninstall.xml", 'w' file.puts ' @@ -26,7 +28,6 @@ cask 'adobe-photoshop-cc-fr' do file.close system '/usr/bin/sudo', '-E', '--', "#{staged_path}/Adobe Photoshop CC 2015/Install.app/Contents/MacOS/Install", '--mode=silent', "--deploymentFile=#{staged_path}/Adobe\ Photoshop\ CC\ 2015/Deployment/fr_FR_Deployment.xml" - end uninstall_preflight do @@ -34,6 +35,4 @@ cask 'adobe-photoshop-cc-fr' do end uninstall :rmdir => '/Applications/Utilities/Adobe Installers' - - conflicts_with :cask => 'adobe-photoshop-cc' end diff --git a/Casks/adobe-photoshop-cc-it.rb b/Casks/adobe-photoshop-cc-it.rb index 67f3d6fa2..7100d2129 100644 --- a/Casks/adobe-photoshop-cc-it.rb +++ b/Casks/adobe-photoshop-cc-it.rb @@ -4,11 +4,13 @@ cask 'adobe-photoshop-cc-it' do url 'http://trials3.adobe.com/AdobeProducts/PHSP/16/osx10/Photoshop_16_LS20.dmg', :user_agent => :fake, - :cookies => { 'MM_TRIALS' => '1234' } + :cookies => { 'MM_TRIALS' => '1234' } name 'Adobe Photoshop CC 2015' homepage 'https://www.adobe.com/products/photoshop.html' license :commercial + conflicts_with :cask => 'adobe-photoshop-cc' + preflight do file = File.open "#{staged_path}/uninstall.xml", 'w' file.puts ' @@ -26,7 +28,6 @@ cask 'adobe-photoshop-cc-it' do file.close system '/usr/bin/sudo', '-E', '--', "#{staged_path}/Adobe Photoshop CC 2015/Install.app/Contents/MacOS/Install", '--mode=silent', "--deploymentFile=#{staged_path}/Adobe\ Photoshop\ CC\ 2015/Deployment/it_IT_Deployment.xml" - end uninstall_preflight do @@ -34,6 +35,4 @@ cask 'adobe-photoshop-cc-it' do end uninstall :rmdir => '/Applications/Utilities/Adobe Installers' - - conflicts_with :cask => 'adobe-photoshop-cc' end diff --git a/Casks/adobe-photoshop-cc-ja.rb b/Casks/adobe-photoshop-cc-ja.rb index be0ffa1a6..7d2913415 100644 --- a/Casks/adobe-photoshop-cc-ja.rb +++ b/Casks/adobe-photoshop-cc-ja.rb @@ -4,11 +4,13 @@ cask 'adobe-photoshop-cc-ja' do url 'http://trials3.adobe.com/AdobeProducts/PHSP/16/osx10/Photoshop_16_LS20.dmg', :user_agent => :fake, - :cookies => { 'MM_TRIALS' => '1234' } + :cookies => { 'MM_TRIALS' => '1234' } name 'Adobe Photoshop CC 2015' homepage 'https://www.adobe.com/products/photoshop.html' license :commercial + conflicts_with :cask => 'adobe-photoshop-cc' + preflight do file = File.open "#{staged_path}/uninstall.xml", 'w' file.puts ' @@ -26,7 +28,6 @@ cask 'adobe-photoshop-cc-ja' do file.close system '/usr/bin/sudo', '-E', '--', "#{staged_path}/Adobe Photoshop CC 2015/Install.app/Contents/MacOS/Install", '--mode=silent', "--deploymentFile=#{staged_path}/Adobe\ Photoshop\ CC\ 2015/Deployment/ja_JP_Deployment.xml" - end uninstall_preflight do @@ -34,6 +35,4 @@ cask 'adobe-photoshop-cc-ja' do end uninstall :rmdir => '/Applications/Utilities/Adobe Installers' - - conflicts_with :cask => 'adobe-photoshop-cc' end diff --git a/Casks/adobe-photoshop-cc-nl.rb b/Casks/adobe-photoshop-cc-nl.rb index 81d646d4b..b17d57449 100644 --- a/Casks/adobe-photoshop-cc-nl.rb +++ b/Casks/adobe-photoshop-cc-nl.rb @@ -4,11 +4,13 @@ cask 'adobe-photoshop-cc-nl' do url 'http://trials3.adobe.com/AdobeProducts/PHSP/16/osx10/Photoshop_16_LS20.dmg', :user_agent => :fake, - :cookies => { 'MM_TRIALS' => '1234' } + :cookies => { 'MM_TRIALS' => '1234' } name 'Adobe Photoshop CC 2015' homepage 'https://www.adobe.com/products/photoshop.html' license :commercial + conflicts_with :cask => 'adobe-photoshop-cc' + preflight do file = File.open "#{staged_path}/uninstall.xml", 'w' file.puts ' @@ -26,7 +28,6 @@ cask 'adobe-photoshop-cc-nl' do file.close system '/usr/bin/sudo', '-E', '--', "#{staged_path}/Adobe Photoshop CC 2015/Install.app/Contents/MacOS/Install", '--mode=silent', "--deploymentFile=#{staged_path}/Adobe\ Photoshop\ CC\ 2015/Deployment/nl_NL_Deployment.xml" - end uninstall_preflight do @@ -34,6 +35,4 @@ cask 'adobe-photoshop-cc-nl' do end uninstall :rmdir => '/Applications/Utilities/Adobe Installers' - - conflicts_with :cask => 'adobe-photoshop-cc' end diff --git a/Casks/adobe-photoshop-cs5.rb b/Casks/adobe-photoshop-cs5.rb index cfca4a7ef..c2274ace8 100644 --- a/Casks/adobe-photoshop-cs5.rb +++ b/Casks/adobe-photoshop-cs5.rb @@ -9,8 +9,8 @@ cask 'adobe-photoshop-cs5' do # https://helpx.adobe.com/creative-suite/kb/cs5-product-downloads.html url 'http://trials2.adobe.com/dlm/AdobeProducts/PHSP/12/osx10/Photoshop_12_LS1.dmg', - :user_agent => :fake, - :cookies => { 'MM_TRIALS' => '1234' } + :user_agent => :fake, + :cookies => { 'MM_TRIALS' => '1234' } name 'Adobe Photoshop CS5' # name must exactly match directory in dmg! homepage 'https://www.adobe.com/mena_en/products/creativesuite.html' license :commercial @@ -28,10 +28,10 @@ cask 'adobe-photoshop-cs5' do # deployment file. launching the uninstall app will not work in silent mode. # keeping the code here and commented out in case there's a way. - #uninstall_preflight do + # uninstall_preflight do # system '/usr/bin/killall', '-kill', 'SafariNotificationAgent' # system '/usr/bin/sudo', '-E', '--', "/Library/Application Support/Adobe/Uninstall/{15FEDA5F-141C-4127-8D7E-B962D1742728}.app/Contents/MacOS/Uninstall Product", "--mode=silent", "--deploymentFile=#{staged_path}/Adobe CS6 Design Standard/deploy/uninstall-en_US.xml" - #end + # end caveats 'Installation or Uninstallation may fail with Exit Code 19 (Conflicting Processes running) if Browsers, Safari Notification Service or SIMBL Services (e.g. Flashlight) are running or Adobe Creative Cloud or any other Adobe Products are already installed. See Logs in /Library/Logs/Adobe/Installers if Installation or Uninstallation fails, to identifify the conflicting processes.' end diff --git a/Casks/adobe-photoshop-lightroom571.rb b/Casks/adobe-photoshop-lightroom571.rb index b6fb5440c..71cd06722 100644 --- a/Casks/adobe-photoshop-lightroom571.rb +++ b/Casks/adobe-photoshop-lightroom571.rb @@ -2,7 +2,7 @@ cask 'adobe-photoshop-lightroom571' do version '5.7.1' sha256 '155a91e2c90927a05ccaa244a99fed4784fa7cf26d08c634f5f111629f6b0418' - url "http://download.adobe.com/pub/adobe/lightroom/mac/#{version.to_i}.x/Lightroom_#{version.to_i}_LS11_mac_#{version.gsub('.','_')}.dmg" + url "http://download.adobe.com/pub/adobe/lightroom/mac/#{version.to_i}.x/Lightroom_#{version.to_i}_LS11_mac_#{version.gsub('.', '_')}.dmg" name 'Adobe Photoshop Lightroom' homepage 'https://www.adobe.com/products/photoshop-lightroom.html' license :commercial @@ -10,10 +10,11 @@ cask 'adobe-photoshop-lightroom571' do pkg "Adobe Photoshop Lightroom #{version.to_i}.pkg" uninstall :pkgutil => "com.adobe.Lightroom#{version.to_i}", - :quit => "com.adobe.Lightroom#{version.to_i}", - :delete => "/Applications/Adobe Photoshop Lightroom #{version.to_i}.app" + :quit => "com.adobe.Lightroom#{version.to_i}", + :delete => "/Applications/Adobe Photoshop Lightroom #{version.to_i}.app" + zap :delete => [ - '~/Library/Application Support/Adobe/Lightroom', - "~/Library/Preferences/com.adobe.Lightroom#{version.to_i}.plist", + '~/Library/Application Support/Adobe/Lightroom', + "~/Library/Preferences/com.adobe.Lightroom#{version.to_i}.plist", ] end diff --git a/Casks/adobe-photoshop-lightroom600.rb b/Casks/adobe-photoshop-lightroom600.rb index 5c354879f..39c6b07e1 100644 --- a/Casks/adobe-photoshop-lightroom600.rb +++ b/Casks/adobe-photoshop-lightroom600.rb @@ -3,8 +3,8 @@ cask 'adobe-photoshop-lightroom600' do sha256 '5c36e5fa76b8676144c4bba9790fe4c597daf350b2195a2088346b097f46a95f' url "http://trials3.adobe.com/AdobeProducts/LTRM/#{version.to_i}/osx10/Lightroom_#{version.to_i}_LS11.dmg", - :user_agent => :fake, - :cookies => { 'MM_TRIALS' => '1234' } + :user_agent => :fake, + :cookies => { 'MM_TRIALS' => '1234' } name 'Adobe Photoshop Lightroom' homepage 'https://www.adobe.com/products/photoshop-lightroom.html' license :commercial @@ -20,13 +20,14 @@ cask 'adobe-photoshop-lightroom600' do uninstall_preflight do system '/usr/bin/killall', '-kill', 'SafariNotificationAgent' - system '/usr/bin/sudo', '-E', '--', "#{staged_path}/Install.app/Contents/MacOS/Install", "--mode=silent", "--deploymentFile=#{staged_path}/deploy/AdobeLightroom6.remove.xml" + system '/usr/bin/sudo', '-E', '--', "#{staged_path}/Install.app/Contents/MacOS/Install", '--mode=silent', "--deploymentFile=#{staged_path}/deploy/AdobeLightroom6.remove.xml" end - uninstall :delete => "/Applications/Adobe Lightroom/Adobe Lightroom.app" + uninstall :delete => '/Applications/Adobe Lightroom/Adobe Lightroom.app' + zap :delete => [ - '~/Library/Application Support/Adobe/Lightroom', - "~/Library/Preferences/com.adobe.Lightroom#{version.to_i}.plist", + '~/Library/Application Support/Adobe/Lightroom', + "~/Library/Preferences/com.adobe.Lightroom#{version.to_i}.plist", ] caveats 'Installation or Uninstallation may fail with Exit Code 19 (Conflicting Processes running) if Browsers, Safari Notification Service or SIMBL Services are running or Adobe Creative Cloud or any other Adobe Products are already installed. See Logs in /Library/Logs/Adobe/Installers if Installation or Uninstallation fails, to identify the conflicting processes.' diff --git a/Casks/adobe-production-premium-cs6-de.rb b/Casks/adobe-production-premium-cs6-de.rb index 5a17ecbb5..dd90a34d1 100644 --- a/Casks/adobe-production-premium-cs6-de.rb +++ b/Casks/adobe-production-premium-cs6-de.rb @@ -9,8 +9,8 @@ cask 'adobe-production-premium-cs6-de' do # https://helpx.adobe.com/x-productkb/policy-pricing/cs6-product-downloads.html url 'http://trials2.adobe.com/AdobeProducts/STVD/CS6/osx10/ProductionPremium_CS6_LS7.dmg', - :user_agent => :fake, - :cookies => { 'MM_TRIALS' => '1234' } + :user_agent => :fake, + :cookies => { 'MM_TRIALS' => '1234' } name 'Adobe CS6 Production Premium' # name must exactly match directory in dmg! homepage 'https://www.adobe.com/mena_en/products/creativesuite.html' license :commercial diff --git a/Casks/adobe-production-premium-cs6-es.rb b/Casks/adobe-production-premium-cs6-es.rb index 4b4f60a57..06b1ee68c 100644 --- a/Casks/adobe-production-premium-cs6-es.rb +++ b/Casks/adobe-production-premium-cs6-es.rb @@ -9,8 +9,8 @@ cask 'adobe-production-premium-cs6-es' do # https://helpx.adobe.com/x-productkb/policy-pricing/cs6-product-downloads.html url 'http://trials2.adobe.com/AdobeProducts/STVD/CS6/osx10/ProductionPremium_CS6_LS7.dmg', - :user_agent => :fake, - :cookies => { 'MM_TRIALS' => '1234' } + :user_agent => :fake, + :cookies => { 'MM_TRIALS' => '1234' } name 'Adobe CS6 Production Premium' # name must exactly match directory in dmg! homepage 'https://www.adobe.com/mena_en/products/creativesuite.html' license :commercial diff --git a/Casks/adobe-production-premium-cs6-fr.rb b/Casks/adobe-production-premium-cs6-fr.rb index 7ce271fda..2f5086392 100644 --- a/Casks/adobe-production-premium-cs6-fr.rb +++ b/Casks/adobe-production-premium-cs6-fr.rb @@ -9,8 +9,8 @@ cask 'adobe-production-premium-cs6-fr' do # https://helpx.adobe.com/x-productkb/policy-pricing/cs6-product-downloads.html url 'http://trials2.adobe.com/AdobeProducts/STVD/CS6/osx10/ProductionPremium_CS6_LS7.dmg', - :user_agent => :fake, - :cookies => { 'MM_TRIALS' => '1234' } + :user_agent => :fake, + :cookies => { 'MM_TRIALS' => '1234' } name 'Adobe CS6 Production Premium' # name must exactly match directory in dmg! homepage 'https://www.adobe.com/mena_en/products/creativesuite.html' license :commercial diff --git a/Casks/adobe-production-premium-cs6-it.rb b/Casks/adobe-production-premium-cs6-it.rb index 3f64b27ee..4de0a73af 100644 --- a/Casks/adobe-production-premium-cs6-it.rb +++ b/Casks/adobe-production-premium-cs6-it.rb @@ -9,8 +9,8 @@ cask 'adobe-production-premium-cs6-it' do # https://helpx.adobe.com/x-productkb/policy-pricing/cs6-product-downloads.html url 'http://trials2.adobe.com/AdobeProducts/STVD/CS6/osx10/ProductionPremium_CS6_LS7.dmg', - :user_agent => :fake, - :cookies => { 'MM_TRIALS' => '1234' } + :user_agent => :fake, + :cookies => { 'MM_TRIALS' => '1234' } name 'Adobe CS6 Production Premium' # name must exactly match directory in dmg! homepage 'https://www.adobe.com/mena_en/products/creativesuite.html' license :commercial diff --git a/Casks/adobe-production-premium-cs6-ja.rb b/Casks/adobe-production-premium-cs6-ja.rb index 410aad9a3..b62474e5a 100644 --- a/Casks/adobe-production-premium-cs6-ja.rb +++ b/Casks/adobe-production-premium-cs6-ja.rb @@ -9,8 +9,8 @@ cask 'adobe-production-premium-cs6-ja' do # https://helpx.adobe.com/x-productkb/policy-pricing/cs6-product-downloads.html url 'http://trials2.adobe.com/AdobeProducts/STVD/CS6/osx10/ProductionPremium_CS6_LS7.dmg', - :user_agent => :fake, - :cookies => { 'MM_TRIALS' => '1234' } + :user_agent => :fake, + :cookies => { 'MM_TRIALS' => '1234' } name 'Adobe CS6 Production Premium' # name must exactly match directory in dmg! homepage 'https://www.adobe.com/mena_en/products/creativesuite.html' license :commercial diff --git a/Casks/adobe-production-premium-cs6.rb b/Casks/adobe-production-premium-cs6.rb index 881150151..f19a810f1 100644 --- a/Casks/adobe-production-premium-cs6.rb +++ b/Casks/adobe-production-premium-cs6.rb @@ -9,8 +9,8 @@ cask 'adobe-production-premium-cs6' do # https://helpx.adobe.com/x-productkb/policy-pricing/cs6-product-downloads.html url 'http://trials2.adobe.com/AdobeProducts/STVD/CS6/osx10/ProductionPremium_CS6_LS7.dmg', - :user_agent => :fake, - :cookies => { 'MM_TRIALS' => '1234' } + :user_agent => :fake, + :cookies => { 'MM_TRIALS' => '1234' } name 'Adobe CS6 Production Premium' # name must exactly match directory in dmg! homepage 'https://www.adobe.com/mena_en/products/creativesuite.html' license :commercial diff --git a/Casks/adobe-reader-de.rb b/Casks/adobe-reader-de.rb index 27ade53fa..1e1dcacac 100644 --- a/Casks/adobe-reader-de.rb +++ b/Casks/adobe-reader-de.rb @@ -5,13 +5,15 @@ cask 'adobe-reader-de' do url "http://ardownload.adobe.com/pub/adobe/reader/mac/#{version.to_i}.x/#{version}/de_DE/AdbeRdr#{version.gsub('.', '')}_de_DE.dmg" name 'Adobe Reader' homepage 'https://www.adobe.com/de/products/reader.html' - license :unknown + license :unknown # TODO: change license and remove this comment; ':unknown' is a machine-generated placeholder pkg 'Adobe Reader XI Installer.pkg' + uninstall :pkgutil => "com.adobe.acrobat.reader.#{version.gsub('.', '')}.*", - :delete => '/Applications/Adobe Reader.app' + :delete => '/Applications/Adobe Reader.app' + zap :delete => [ - "~/Library/Application Support/Adobe/Acrobat/#{version.sub(%r{(\d+)\.(\d+).*},'\1.\2')}", - '~/Library/Preferences/com.adobe.Reader.plist', + "~/Library/Application Support/Adobe/Acrobat/#{version.sub(%r{(\d+)\.(\d+).*}, '\1.\2')}", + '~/Library/Preferences/com.adobe.Reader.plist', ] end diff --git a/Casks/adobe-reader-fr.rb b/Casks/adobe-reader-fr.rb index ccdfe1e16..4f20e0891 100644 --- a/Casks/adobe-reader-fr.rb +++ b/Casks/adobe-reader-fr.rb @@ -5,13 +5,15 @@ cask 'adobe-reader-fr' do url "http://ardownload.adobe.com/pub/adobe/reader/mac/#{version.to_i}.x/#{version}/fr_FR/AdbeRdr#{version.gsub('.', '')}_fr_FR.dmg" name 'Adobe Reader' homepage 'https://www.adobe.com/fr/products/reader.html' - license :unknown + license :unknown # TODO: change license and remove this comment; ':unknown' is a machine-generated placeholder pkg 'Adobe Reader XI Installer.pkg' + uninstall :pkgutil => "com.adobe.acrobat.reader.#{version.gsub('.', '')}.*", - :delete => '/Applications/Adobe Reader.app' + :delete => '/Applications/Adobe Reader.app' + zap :delete => [ - "~/Library/Application Support/Adobe/Acrobat/#{version.sub(%r{(\d+)\.(\d+)\.*},'\1.\2')}", - '~/Library/Preferences/com.adobe.Reader.plist', + "~/Library/Application Support/Adobe/Acrobat/#{version.sub(%r{(\d+)\.(\d+)\.*}, '\1.\2')}", + '~/Library/Preferences/com.adobe.Reader.plist', ] end diff --git a/Casks/adobe-reader-ja.rb b/Casks/adobe-reader-ja.rb index d5b19a13b..5c7578685 100644 --- a/Casks/adobe-reader-ja.rb +++ b/Casks/adobe-reader-ja.rb @@ -1,6 +1,7 @@ cask 'adobe-reader-ja' do version '11.0.00' sha256 '69f71085799700ecd7e7f59e14095eafc5889e8962ed3a2e84e0a40d3a04d570' + major_version = version.split('.')[0] url "http://ardownload.adobe.com/pub/adobe/reader/mac/#{major_version}.x/#{version}/ja_JP/AdbeRdr#{version.gsub('.', '')}_ja_JP.dmg" @@ -9,6 +10,7 @@ cask 'adobe-reader-ja' do license :closed pkg 'Adobe Reader XI Installer.pkg' + uninstall :pkgutil => "com.adobe.acrobat.reader.#{major_version}.*", :delete => '/Applications/Adobe Reader.app' end diff --git a/Casks/adobe-reader-pl.rb b/Casks/adobe-reader-pl.rb index aff7bc475..a304b2752 100644 --- a/Casks/adobe-reader-pl.rb +++ b/Casks/adobe-reader-pl.rb @@ -10,10 +10,11 @@ cask 'adobe-reader-pl' do pkg 'Adobe Reader XI Installer.pkg' uninstall :pkgutil => "com.adobe.acrobat.reader.#{version.gsub('.', '')}.*", - :delete => '/Applications/Adobe Reader.app' + :delete => '/Applications/Adobe Reader.app' + zap :delete => [ - "~/Library/Application Support/Adobe/Acrobat/#{version.sub(%r{(\d+)\.(\d+).*},'\1.\2')}", - '~/Library/Preferences/com.adobe.Reader.plist', - '~/Library/Caches/com.adobe.Reader' + "~/Library/Application Support/Adobe/Acrobat/#{version.sub(%r{(\d+)\.(\d+).*}, '\1.\2')}", + '~/Library/Preferences/com.adobe.Reader.plist', + '~/Library/Caches/com.adobe.Reader', ] end diff --git a/Casks/adobe-reader-pt-br.rb b/Casks/adobe-reader-pt-br.rb index 4cb9768fd..a9c82b666 100644 --- a/Casks/adobe-reader-pt-br.rb +++ b/Casks/adobe-reader-pt-br.rb @@ -8,10 +8,12 @@ cask 'adobe-reader-pt-br' do license :gratis pkg 'Adobe Reader XI Installer.pkg' + uninstall :pkgutil => "com.adobe.acrobat.reader.#{version.gsub('.', '')}.*", - :delete => '/Applications/Adobe Reader.app' + :delete => '/Applications/Adobe Reader.app' + zap :delete => [ - "~/Library/Application Support/Adobe/Acrobat/#{version.sub(%r{(\d+)\.(\d+)\.*},'\1.\2')}", - '~/Library/Preferences/com.adobe.Reader.plist', + "~/Library/Application Support/Adobe/Acrobat/#{version.sub(%r{(\d+)\.(\d+)\.*}, '\1.\2')}", + '~/Library/Preferences/com.adobe.Reader.plist', ] end diff --git a/Casks/airmail-beta.rb b/Casks/airmail-beta.rb index 9491e88ff..4a4df3db9 100644 --- a/Casks/airmail-beta.rb +++ b/Casks/airmail-beta.rb @@ -6,7 +6,7 @@ cask 'airmail-beta' do url 'https://rink.hockeyapp.net/api/2/apps/84be85c3331ee1d222fd7f0b59e41b04?format=zip' name 'AirMail' homepage 'http://airmailapp.com/beta/' - license :unknown + license :unknown # TODO: change license and remove this comment; ':unknown' is a machine-generated placeholder app 'AirMail Beta.app' end diff --git a/Casks/anaconda2.rb b/Casks/anaconda2.rb index 8897670af..bf95735f1 100644 --- a/Casks/anaconda2.rb +++ b/Casks/anaconda2.rb @@ -7,21 +7,20 @@ cask 'anaconda2' do homepage 'https://www.continuum.io/why-anaconda' license :gratis + depends_on :macos => '>= :lion' container :type => :naked + installer :script => "Anaconda2-#{version}-MacOSX-x86_64.sh", + :args => ['-b'], + :sudo => false + preflight do set_permissions "#{staged_path}/Anaconda2-#{version}-MacOSX-x86_64.sh", '+x' end - installer :script => "Anaconda2-#{version}-MacOSX-x86_64.sh", - :args => [ '-b' ], - :sudo => false - uninstall :delete => '~/anaconda2' caveats do path_environment_variable '~/anaconda2/bin' end - - depends_on :macos => '>= :lion' end diff --git a/Casks/android-studio-canary.rb b/Casks/android-studio-canary.rb index 5c2b6b5f3..0f2342dde 100644 --- a/Casks/android-studio-canary.rb +++ b/Casks/android-studio-canary.rb @@ -2,13 +2,13 @@ cask 'android-studio-canary' do version '2.0.0.5-143.2532994' sha256 '9d86b86a902fc756ecdc600f39a5b847fc119d7af80303f6f30d65974ae6bd07' - url "https://dl.google.com/dl/android/studio/ide-zips/#{version.sub(%r{-.*},'')}/android-studio-ide-#{version.sub(%r{.*?-},'')}-mac.zip" + url "https://dl.google.com/dl/android/studio/ide-zips/#{version.sub(%r{-.*}, '')}/android-studio-ide-#{version.sub(%r{.*?-}, '')}-mac.zip" name 'Android Studio Canary' homepage 'https://sites.google.com/a/android.com/tools/download/studio/canary' license :apache app 'Android Studio.app' - + zap :delete => [ '~/Library/Preferences/AndroidStudio*', '~/Library/Preferences/com.google.android.studio.plist', @@ -16,7 +16,7 @@ cask 'android-studio-canary' do '~/Library/Logs/AndroidStudio*', '~/Library/Caches/AndroidStudio*', ], - :rmdir => '~/AndroidStudioProjects' + :rmdir => '~/AndroidStudioProjects' caveats do depends_on_java diff --git a/Casks/appcode-eap.rb b/Casks/appcode-eap.rb index 298bba6d5..479f3ad00 100644 --- a/Casks/appcode-eap.rb +++ b/Casks/appcode-eap.rb @@ -7,15 +7,15 @@ cask 'appcode-eap' do homepage 'https://confluence.jetbrains.com/display/OBJC/AppCode+EAP' license :commercial + conflicts_with :cask => 'appcode' + app 'AppCode EAP.app' zap :delete => [ - '~/Library/Preferences/com.jetbrains.AppCode-EAP.plist', - '~/Library/Preferences/AppCode33', - '~/Library/Application Support/AppCode33', - '~/Library/Caches/AppCode33', - '~/Library/Logs/AppCode33', + '~/Library/Preferences/com.jetbrains.AppCode-EAP.plist', + '~/Library/Preferences/AppCode33', + '~/Library/Application Support/AppCode33', + '~/Library/Caches/AppCode33', + '~/Library/Logs/AppCode33', ] - - conflicts_with :cask => 'appcode' end diff --git a/Casks/atom-beta.rb b/Casks/atom-beta.rb index 071ec35f1..b551cf21a 100644 --- a/Casks/atom-beta.rb +++ b/Casks/atom-beta.rb @@ -22,12 +22,12 @@ cask 'atom-beta' do end zap :delete => [ - '~/.atom', - '~/Library/Application Support/ShipIt_stderr.log', - '~/Library/Application Support/Atom', - '~/Library/Application Support/ShipIt_stdout.log', - '~/Library/Application Support/com.github.atom.ShipIt', - '~/Library/Caches/com.github.atom', - '~/Library/Preferences/com.github.atom.plist', + '~/.atom', + '~/Library/Application Support/ShipIt_stderr.log', + '~/Library/Application Support/Atom', + '~/Library/Application Support/ShipIt_stdout.log', + '~/Library/Application Support/com.github.atom.ShipIt', + '~/Library/Caches/com.github.atom', + '~/Library/Preferences/com.github.atom.plist', ] end diff --git a/Casks/audio-hijack-pro.rb b/Casks/audio-hijack-pro.rb index 5ecf0c681..144f41d6b 100644 --- a/Casks/audio-hijack-pro.rb +++ b/Casks/audio-hijack-pro.rb @@ -2,15 +2,15 @@ cask 'audio-hijack-pro' do version '2.11.4' sha256 '7fd4dc4b08b1b0e72dbf59b47c655840ceb75801d0362c778c436a2532ae239c' - url "https://rogueamoeba.com/legacy/downloads/AudioHijackPro-#{version.gsub('.','')}.zip" + url "https://rogueamoeba.com/legacy/downloads/AudioHijackPro-#{version.gsub('.', '')}.zip" name 'Audio Hijack Pro' homepage 'https://www.rogueamoeba.com/audiohijackpro/' license :commercial - app 'Audio Hijack Pro.app' + depends_on :macos => %w[ + :lion + :mountain_lion + ] - depends_on :macos => %w{ - :lion - :mountain_lion - } + app 'Audio Hijack Pro.app' end diff --git a/Casks/battle-net-zh-cn.rb b/Casks/battle-net-zh-cn.rb index 3e50ba490..396bac1d5 100644 --- a/Casks/battle-net-zh-cn.rb +++ b/Casks/battle-net-zh-cn.rb @@ -13,11 +13,11 @@ cask 'battle-net-zh-cn' do uninstall :delete => '/Applications/Battle.net.app' zap :delete => [ - '~/Library/Preferences/net.battle.net.app.plist', - '~/Library/Preferences/net.battle.Authenticator.prefs', - '~/Library/Preferences/net.battle.Identity.prefs', - '~/Library/Preferences/net.battnet.battle.plist', - '/Users/Shared/Battle.net' + '~/Library/Preferences/net.battle.net.app.plist', + '~/Library/Preferences/net.battle.Authenticator.prefs', + '~/Library/Preferences/net.battle.Identity.prefs', + '~/Library/Preferences/net.battnet.battle.plist', + '/Users/Shared/Battle.net', ] caveats 'If you pick an installation directory other than /Applications when installing this cask, you will need to uninstall it manually' diff --git a/Casks/camtwist-beta.rb b/Casks/camtwist-beta.rb index 4b7972c31..0005effcd 100644 --- a/Casks/camtwist-beta.rb +++ b/Casks/camtwist-beta.rb @@ -6,11 +6,11 @@ cask 'camtwist-beta' do name 'CamTwist' homepage 'http://camtwiststudio.com/' license :gratis - + depends_on :macos => '>= 10.10' pkg 'CamTwist.pkg' - uninstall :script => { :executable => 'Manual Install/CamTwist/uninstall.command' }, + uninstall :script => { :executable => 'Manual Install/CamTwist/uninstall.command' }, :pkgutil => 'com.allocinit.camtwist.*' end diff --git a/Casks/charles-applejava.rb b/Casks/charles-applejava.rb index b39f3fb55..074d6e540 100644 --- a/Casks/charles-applejava.rb +++ b/Casks/charles-applejava.rb @@ -2,7 +2,7 @@ cask 'charles-applejava' do version '3.11.2' sha256 'f6ccc84c710a982147bf5ff09c2cd8eaff74cf31668bd9f4f2b137555cae0007' - url "https://www.charlesproxy.com/assets/release/#{version.gsub(/b\d$/, '')}/charles-proxy-#{version}-applejava.dmg" + url "https://www.charlesproxy.com/assets/release/#{version.gsub(%r{b\d$}, '')}/charles-proxy-#{version}-applejava.dmg" name 'Charles' homepage 'https://www.charlesproxy.com/download/' license :commercial @@ -10,7 +10,7 @@ cask 'charles-applejava' do app 'Charles.app' zap :delete => [ - '~/Library/Application Support/Charles', - '~/Library/Preferences/com.xk72.charles.config', + '~/Library/Application Support/Charles', + '~/Library/Preferences/com.xk72.charles.config', ] end diff --git a/Casks/charles-beta-applejava.rb b/Casks/charles-beta-applejava.rb index fe52686d5..e1688996c 100644 --- a/Casks/charles-beta-applejava.rb +++ b/Casks/charles-beta-applejava.rb @@ -2,7 +2,7 @@ cask 'charles-beta-applejava' do version '3.11.3b5' sha256 'd2ed58fc2e5d4a77c79932819edadb127f4963ea71b2c3843fc13946a02c0410' - url "https://www.charlesproxy.com/assets/release/#{version.gsub(/b\d$/, '')}/charles-proxy-#{version}-applejava.dmg" + url "https://www.charlesproxy.com/assets/release/#{version.gsub(%r{b\d$}, '')}/charles-proxy-#{version}-applejava.dmg" name 'Charles' homepage 'https://www.charlesproxy.com/download/beta/' license :commercial @@ -10,7 +10,7 @@ cask 'charles-beta-applejava' do app 'Charles.app' zap :delete => [ - '~/Library/Application Support/Charles', - '~/Library/Preferences/com.xk72.charles.config', + '~/Library/Application Support/Charles', + '~/Library/Preferences/com.xk72.charles.config', ] end diff --git a/Casks/charles-beta.rb b/Casks/charles-beta.rb index 4e2bb5fdd..7a9e3caf2 100644 --- a/Casks/charles-beta.rb +++ b/Casks/charles-beta.rb @@ -2,7 +2,7 @@ cask 'charles-beta' do version '3.11.3b5' sha256 'ef1215db67aaede00dc61b260d79a051efdc32e0760b9c9f87d1155082705d85' - url "https://www.charlesproxy.com/assets/release/#{version.gsub(/b\d$/, '')}/charles-proxy-#{version}.dmg" + url "https://www.charlesproxy.com/assets/release/#{version.gsub(%r{b\d$}, '')}/charles-proxy-#{version}.dmg" name 'Charles' homepage 'https://www.charlesproxy.com/download/beta/' license :commercial @@ -10,7 +10,7 @@ cask 'charles-beta' do app 'Charles.app' zap :delete => [ - '~/Library/Application Support/Charles', - '~/Library/Preferences/com.xk72.charles.config', + '~/Library/Application Support/Charles', + '~/Library/Preferences/com.xk72.charles.config', ] end diff --git a/Casks/clion-eap.rb b/Casks/clion-eap.rb index b903ce777..5b7aa4982 100644 --- a/Casks/clion-eap.rb +++ b/Casks/clion-eap.rb @@ -10,10 +10,10 @@ cask 'clion-eap' do app 'CLion EAP.app' zap :delete => [ - '~/Library/Preferences/com.jetbrains.CLion-EAP.plist', - '~/Library/Preferences/CLion15', - '~/Library/Application Support/CLion15', - '~/Library/Caches/CLion15', - '~/Library/Logs/CLion15', - ] + '~/Library/Preferences/com.jetbrains.CLion-EAP.plist', + '~/Library/Preferences/CLion15', + '~/Library/Application Support/CLion15', + '~/Library/Caches/CLion15', + '~/Library/Logs/CLion15', + ] end diff --git a/Casks/clipmenu-alpha.rb b/Casks/clipmenu-alpha.rb index ccaa658d5..d760e2161 100644 --- a/Casks/clipmenu-alpha.rb +++ b/Casks/clipmenu-alpha.rb @@ -8,7 +8,7 @@ cask 'clipmenu-alpha' do homepage 'http://www.clipmenu.com/' license :mit - app 'ClipMenu.app' - depends_on :macos => '>= :mavericks' + + app 'ClipMenu.app' end diff --git a/Casks/clipmenu-dev.rb b/Casks/clipmenu-dev.rb index 7e09afc3b..2df822a12 100644 --- a/Casks/clipmenu-dev.rb +++ b/Casks/clipmenu-dev.rb @@ -11,7 +11,7 @@ cask 'clipmenu-dev' do app 'ClipMenu.app' zap :delete => [ - '~/Library/Application Support/ClipMenu', - '~/Library/Preferences/com.naotaka.ClipMenu.plist', + '~/Library/Application Support/ClipMenu', + '~/Library/Preferences/com.naotaka.ClipMenu.plist', ] end diff --git a/Casks/dropbox-experimental.rb b/Casks/dropbox-experimental.rb index 28ff1fb76..3fa3195b9 100644 --- a/Casks/dropbox-experimental.rb +++ b/Casks/dropbox-experimental.rb @@ -8,8 +8,8 @@ cask 'dropbox-experimental' do license :gratis app 'Dropbox.app' - + uninstall :login_item => 'Dropbox' - + zap :delete => '~/.dropbox' end diff --git a/Casks/earlybird.rb b/Casks/earlybird.rb index 90c6d4967..9dc307ad4 100644 --- a/Casks/earlybird.rb +++ b/Casks/earlybird.rb @@ -1,6 +1,6 @@ cask 'earlybird' do version '43.0a2' - sha256 :no_check # required as upstream package is updated in-placea + sha256 :no_check # required as upstream package is updated in-placea url "https://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly/latest-earlybird/thunderbird-#{version}.en-US.mac.dmg" name 'Earlybird' diff --git a/Casks/firefox-beta-de.rb b/Casks/firefox-beta-de.rb index 7d0265b6c..d121c6c92 100644 --- a/Casks/firefox-beta-de.rb +++ b/Casks/firefox-beta-de.rb @@ -10,7 +10,7 @@ cask 'firefox-beta-de' do app 'Firefox.app' zap :delete => [ - '~/Library/Application Support/Firefox', - '~/Library/Caches/Firefox', + '~/Library/Application Support/Firefox', + '~/Library/Caches/Firefox', ] end diff --git a/Casks/firefox-beta-en-gb.rb b/Casks/firefox-beta-en-gb.rb index 4523e2cc8..ce067a9d9 100644 --- a/Casks/firefox-beta-en-gb.rb +++ b/Casks/firefox-beta-en-gb.rb @@ -10,7 +10,7 @@ cask 'firefox-beta-en-gb' do app 'Firefox.app' zap :delete => [ - '~/Library/Application Support/Firefox', - '~/Library/Caches/Firefox', + '~/Library/Application Support/Firefox', + '~/Library/Caches/Firefox', ] end diff --git a/Casks/firefox-beta-ja.rb b/Casks/firefox-beta-ja.rb index 8f0e95120..339f58ce3 100644 --- a/Casks/firefox-beta-ja.rb +++ b/Casks/firefox-beta-ja.rb @@ -10,7 +10,7 @@ cask 'firefox-beta-ja' do app 'Firefox.app' zap :delete => [ - '~/Library/Application Support/Firefox', - '~/Library/Caches/Firefox', + '~/Library/Application Support/Firefox', + '~/Library/Caches/Firefox', ] end diff --git a/Casks/firefox-beta-ru.rb b/Casks/firefox-beta-ru.rb index 48ae6bf00..ef536b33d 100644 --- a/Casks/firefox-beta-ru.rb +++ b/Casks/firefox-beta-ru.rb @@ -10,7 +10,7 @@ cask 'firefox-beta-ru' do app 'Firefox.app' zap :delete => [ - '~/Library/Application Support/Firefox', - '~/Library/Caches/Firefox', + '~/Library/Application Support/Firefox', + '~/Library/Caches/Firefox', ] end diff --git a/Casks/firefox-beta-uk.rb b/Casks/firefox-beta-uk.rb index a413221d3..2ee33d423 100644 --- a/Casks/firefox-beta-uk.rb +++ b/Casks/firefox-beta-uk.rb @@ -10,7 +10,7 @@ cask 'firefox-beta-uk' do app 'Firefox.app' zap :delete => [ - '~/Library/Application Support/Firefox', - '~/Library/Caches/Firefox', + '~/Library/Application Support/Firefox', + '~/Library/Caches/Firefox', ] end diff --git a/Casks/firefox-beta-zh-cn.rb b/Casks/firefox-beta-zh-cn.rb index 234af6731..4eb65a37b 100644 --- a/Casks/firefox-beta-zh-cn.rb +++ b/Casks/firefox-beta-zh-cn.rb @@ -10,7 +10,7 @@ cask 'firefox-beta-zh-cn' do app 'Firefox.app' zap :delete => [ - '~/Library/Application Support/Firefox', - '~/Library/Caches/Firefox', + '~/Library/Application Support/Firefox', + '~/Library/Caches/Firefox', ] end diff --git a/Casks/firefox-beta.rb b/Casks/firefox-beta.rb index 8623c432f..1eff2dcd7 100644 --- a/Casks/firefox-beta.rb +++ b/Casks/firefox-beta.rb @@ -10,8 +10,8 @@ cask 'firefox-beta' do app 'Firefox.app' zap :delete => [ - '~/Library/Application Support/Firefox', - '~/Library/Caches/Firefox', + '~/Library/Application Support/Firefox', + '~/Library/Caches/Firefox', ] caveats <<-EOS.undent diff --git a/Casks/firefox-de.rb b/Casks/firefox-de.rb index bcc72b142..a1de3c48b 100644 --- a/Casks/firefox-de.rb +++ b/Casks/firefox-de.rb @@ -10,7 +10,7 @@ cask 'firefox-de' do app 'Firefox.app' zap :delete => [ - '~/Library/Application Support/Firefox', - '~/Library/Caches/Firefox', + '~/Library/Application Support/Firefox', + '~/Library/Caches/Firefox', ] end diff --git a/Casks/firefox-esr-ru.rb b/Casks/firefox-esr-ru.rb index 33eb81c18..780e6014c 100644 --- a/Casks/firefox-esr-ru.rb +++ b/Casks/firefox-esr-ru.rb @@ -8,9 +8,9 @@ cask 'firefox-esr-ru' do license :mpl app 'Firefox.app' - + zap :delete => [ - '~/Library/Application Support/Firefox', - '~/Library/Caches/Firefox', + '~/Library/Application Support/Firefox', + '~/Library/Caches/Firefox', ] end diff --git a/Casks/firefox-esr-uk.rb b/Casks/firefox-esr-uk.rb index 0380e9384..258b7f408 100644 --- a/Casks/firefox-esr-uk.rb +++ b/Casks/firefox-esr-uk.rb @@ -8,9 +8,9 @@ cask 'firefox-esr-uk' do license :mpl app 'Firefox.app' - + zap :delete => [ - '~/Library/Application Support/Firefox', - '~/Library/Caches/Firefox', + '~/Library/Application Support/Firefox', + '~/Library/Caches/Firefox', ] end diff --git a/Casks/firefox-esr-zh-cn.rb b/Casks/firefox-esr-zh-cn.rb index 282827cf2..44e62efb3 100644 --- a/Casks/firefox-esr-zh-cn.rb +++ b/Casks/firefox-esr-zh-cn.rb @@ -10,7 +10,7 @@ cask 'firefox-esr-zh-cn' do app 'Firefox.app' zap :delete => [ - '~/Library/Application Support/Firefox', - '~/Library/Caches/Firefox', + '~/Library/Application Support/Firefox', + '~/Library/Caches/Firefox', ] end diff --git a/Casks/firefox-esr.rb b/Casks/firefox-esr.rb index 94327cd96..a1f0808a5 100644 --- a/Casks/firefox-esr.rb +++ b/Casks/firefox-esr.rb @@ -10,7 +10,7 @@ cask 'firefox-esr' do app 'Firefox.app' zap :delete => [ - '~/Library/Application Support/Firefox', - '~/Library/Caches/Firefox', + '~/Library/Application Support/Firefox', + '~/Library/Caches/Firefox', ] end diff --git a/Casks/firefox-fr.rb b/Casks/firefox-fr.rb index 31f4543d8..eeed85c8d 100644 --- a/Casks/firefox-fr.rb +++ b/Casks/firefox-fr.rb @@ -10,7 +10,7 @@ cask 'firefox-fr' do app 'Firefox.app' zap :delete => [ - '~/Library/Application Support/Firefox', - '~/Library/Caches/Firefox', + '~/Library/Application Support/Firefox', + '~/Library/Caches/Firefox', ] end diff --git a/Casks/firefox-gl.rb b/Casks/firefox-gl.rb index 552b72d31..2e38884ab 100644 --- a/Casks/firefox-gl.rb +++ b/Casks/firefox-gl.rb @@ -10,7 +10,7 @@ cask 'firefox-gl' do app 'Firefox.app' zap :delete => [ - '~/Library/Application Support/Firefox', - '~/Library/Caches/Firefox', + '~/Library/Application Support/Firefox', + '~/Library/Caches/Firefox', ] end diff --git a/Casks/firefox-it.rb b/Casks/firefox-it.rb index c4da1e2ee..4aaddd09a 100644 --- a/Casks/firefox-it.rb +++ b/Casks/firefox-it.rb @@ -10,7 +10,7 @@ cask 'firefox-it' do app 'Firefox.app' zap :delete => [ - '~/Library/Application Support/Firefox', - '~/Library/Caches/Firefox', + '~/Library/Application Support/Firefox', + '~/Library/Caches/Firefox', ] end diff --git a/Casks/firefox-ja.rb b/Casks/firefox-ja.rb index 8630dac6e..88099e8ea 100644 --- a/Casks/firefox-ja.rb +++ b/Casks/firefox-ja.rb @@ -10,7 +10,7 @@ cask 'firefox-ja' do app 'Firefox.app' zap :delete => [ - '~/Library/Application Support/Firefox', - '~/Library/Caches/Firefox', + '~/Library/Application Support/Firefox', + '~/Library/Caches/Firefox', ] end diff --git a/Casks/firefox-nightly-ja.rb b/Casks/firefox-nightly-ja.rb index 4478547f6..e3be16c55 100644 --- a/Casks/firefox-nightly-ja.rb +++ b/Casks/firefox-nightly-ja.rb @@ -10,7 +10,7 @@ cask 'firefox-nightly-ja' do app 'FirefoxNightly.app' zap :delete => [ - '~/Library/Application Support/Firefox', - '~/Library/Caches/Firefox', + '~/Library/Application Support/Firefox', + '~/Library/Caches/Firefox', ] end diff --git a/Casks/firefox-nightly.rb b/Casks/firefox-nightly.rb index d41159186..e3eb168ee 100644 --- a/Casks/firefox-nightly.rb +++ b/Casks/firefox-nightly.rb @@ -10,7 +10,7 @@ cask 'firefox-nightly' do app 'FirefoxNightly.app' zap :delete => [ - '~/Library/Application Support/Firefox', - '~/Library/Caches/Firefox', + '~/Library/Application Support/Firefox', + '~/Library/Caches/Firefox', ] end diff --git a/Casks/firefox-nl.rb b/Casks/firefox-nl.rb index 37984afef..db26b50bf 100644 --- a/Casks/firefox-nl.rb +++ b/Casks/firefox-nl.rb @@ -10,7 +10,7 @@ cask 'firefox-nl' do app 'Firefox.app' zap :delete => [ - '~/Library/Application Support/Firefox', - '~/Library/Caches/Firefox', + '~/Library/Application Support/Firefox', + '~/Library/Caches/Firefox', ] end diff --git a/Casks/firefox-pl.rb b/Casks/firefox-pl.rb index 39d218096..6954643c4 100644 --- a/Casks/firefox-pl.rb +++ b/Casks/firefox-pl.rb @@ -10,7 +10,7 @@ cask 'firefox-pl' do app 'Firefox.app' zap :delete => [ - '~/Library/Application Support/Firefox', - '~/Library/Caches/Firefox', + '~/Library/Application Support/Firefox', + '~/Library/Caches/Firefox', ] end diff --git a/Casks/firefox-pt-br.rb b/Casks/firefox-pt-br.rb index d5a298f87..462297b01 100644 --- a/Casks/firefox-pt-br.rb +++ b/Casks/firefox-pt-br.rb @@ -10,7 +10,7 @@ cask 'firefox-pt-br' do app 'Firefox.app' zap :delete => [ - '~/Library/Application Support/Firefox', - '~/Library/Caches/Firefox', + '~/Library/Application Support/Firefox', + '~/Library/Caches/Firefox', ] end diff --git a/Casks/firefox-ru.rb b/Casks/firefox-ru.rb index be4307703..6d80a38e5 100644 --- a/Casks/firefox-ru.rb +++ b/Casks/firefox-ru.rb @@ -10,7 +10,7 @@ cask 'firefox-ru' do app 'Firefox.app' zap :delete => [ - '~/Library/Application Support/Firefox', - '~/Library/Caches/Firefox', + '~/Library/Application Support/Firefox', + '~/Library/Caches/Firefox', ] end diff --git a/Casks/firefox-uk.rb b/Casks/firefox-uk.rb index f7b17b415..3526d6c58 100644 --- a/Casks/firefox-uk.rb +++ b/Casks/firefox-uk.rb @@ -10,7 +10,7 @@ cask 'firefox-uk' do app 'Firefox.app' zap :delete => [ - '~/Library/Application Support/Firefox', - '~/Library/Caches/Firefox', + '~/Library/Application Support/Firefox', + '~/Library/Caches/Firefox', ] end diff --git a/Casks/firefox-zh-cn.rb b/Casks/firefox-zh-cn.rb index 8615406cb..88a641e4b 100644 --- a/Casks/firefox-zh-cn.rb +++ b/Casks/firefox-zh-cn.rb @@ -10,7 +10,7 @@ cask 'firefox-zh-cn' do app 'Firefox.app' zap :delete => [ - '~/Library/Application Support/Firefox', - '~/Library/Caches/Firefox', + '~/Library/Application Support/Firefox', + '~/Library/Caches/Firefox', ] end diff --git a/Casks/firefox-zh-tw.rb b/Casks/firefox-zh-tw.rb index 1e1216a00..09d422e77 100644 --- a/Casks/firefox-zh-tw.rb +++ b/Casks/firefox-zh-tw.rb @@ -10,7 +10,7 @@ cask 'firefox-zh-tw' do app 'Firefox.app' zap :delete => [ - '~/Library/Application Support/Firefox', - '~/Library/Caches/Firefox', + '~/Library/Application Support/Firefox', + '~/Library/Caches/Firefox', ] end diff --git a/Casks/firefoxdeveloperedition-ja.rb b/Casks/firefoxdeveloperedition-ja.rb index e680bfa60..d3d4707e9 100644 --- a/Casks/firefoxdeveloperedition-ja.rb +++ b/Casks/firefoxdeveloperedition-ja.rb @@ -2,7 +2,7 @@ cask 'firefoxdeveloperedition-ja' do version :latest sha256 :no_check - url "https://download.mozilla.org/?product=firefox-aurora-latest-l10n&os=osx&lang=ja-JP-mac" + url 'https://download.mozilla.org/?product=firefox-aurora-latest-l10n&os=osx&lang=ja-JP-mac' name 'Mozilla Firefox Developer Edition' homepage 'https://www.mozilla.org/ja/firefox/developer/' license :mpl diff --git a/Casks/firefoxdeveloperedition.rb b/Casks/firefoxdeveloperedition.rb index 861b9d256..cae37e845 100644 --- a/Casks/firefoxdeveloperedition.rb +++ b/Casks/firefoxdeveloperedition.rb @@ -2,7 +2,7 @@ cask 'firefoxdeveloperedition' do version :latest sha256 :no_check - url "https://download.mozilla.org/?product=firefox-aurora-latest-ssl&os=osx&lang=en-US" + url 'https://download.mozilla.org/?product=firefox-aurora-latest-ssl&os=osx&lang=en-US' name 'Mozilla Firefox Developer Edition' homepage 'https://www.mozilla.org/en-US/firefox/developer/' license :mpl diff --git a/Casks/flux-beta.rb b/Casks/flux-beta.rb index 7bd48eb6d..dc9387ff5 100644 --- a/Casks/flux-beta.rb +++ b/Casks/flux-beta.rb @@ -12,8 +12,8 @@ cask 'flux-beta' do postflight do suppress_move_to_applications end - + uninstall :login_item => 'Flux' - + zap :delete => '~/Library/Preferences/org.herf.Flux.plist' end diff --git a/Casks/google-chrome-beta.rb b/Casks/google-chrome-beta.rb index 96a7017e8..11b8946df 100644 --- a/Casks/google-chrome-beta.rb +++ b/Casks/google-chrome-beta.rb @@ -10,18 +10,18 @@ cask 'google-chrome-beta' do app 'Google Chrome.app' zap :delete => [ - '~/Library/Application Support/Google/Chrome', - '~/Library/Caches/Google/Chrome', - '~/Library/Caches/com.google.Chrome', - '~/Library/Caches/com.google.Chrome.helper.EH', - '~/Library/Caches/com.google.Keystone.Agent', - '~/Library/Caches/com.google.SoftwareUpdate', - '~/Library/Google/GoogleSoftwareUpdate', - '~/Library/Logs/GoogleSoftwareUpdateAgent.log', + '~/Library/Application Support/Google/Chrome', + '~/Library/Caches/Google/Chrome', + '~/Library/Caches/com.google.Chrome', + '~/Library/Caches/com.google.Chrome.helper.EH', + '~/Library/Caches/com.google.Keystone.Agent', + '~/Library/Caches/com.google.SoftwareUpdate', + '~/Library/Google/GoogleSoftwareUpdate', + '~/Library/Logs/GoogleSoftwareUpdateAgent.log', ], :rmdir => [ - '~/Library/Caches/Google', - '~/Library/Google', + '~/Library/Caches/Google', + '~/Library/Google', ] caveats <<-EOS.undent diff --git a/Casks/google-chrome-canary.rb b/Casks/google-chrome-canary.rb index 1a3f10cc9..da627e815 100644 --- a/Casks/google-chrome-canary.rb +++ b/Casks/google-chrome-canary.rb @@ -12,18 +12,18 @@ cask 'google-chrome-canary' do app 'Google Chrome Canary.app' zap :delete => [ - '~/Library/Application Support/Google/Chrome Canary', - '~/Library/Caches/Google/Chrome Canary', - '~/Library/Caches/com.google.Chrome', - '~/Library/Caches/com.google.Chrome.helper.EH', - '~/Library/Caches/com.google.Keystone.Agent', - '~/Library/Caches/com.google.SoftwareUpdate', - '~/Library/Google/GoogleSoftwareUpdate', - '~/Library/Logs/GoogleSoftwareUpdateAgent.log', + '~/Library/Application Support/Google/Chrome Canary', + '~/Library/Caches/Google/Chrome Canary', + '~/Library/Caches/com.google.Chrome', + '~/Library/Caches/com.google.Chrome.helper.EH', + '~/Library/Caches/com.google.Keystone.Agent', + '~/Library/Caches/com.google.SoftwareUpdate', + '~/Library/Google/GoogleSoftwareUpdate', + '~/Library/Logs/GoogleSoftwareUpdateAgent.log', ], :rmdir => [ - '~/Library/Caches/Google', - '~/Library/Google', + '~/Library/Caches/Google', + '~/Library/Google', ] caveats <<-EOS.undent diff --git a/Casks/google-chrome-dev.rb b/Casks/google-chrome-dev.rb index 5f9a3c4a0..6c64246f2 100644 --- a/Casks/google-chrome-dev.rb +++ b/Casks/google-chrome-dev.rb @@ -10,18 +10,18 @@ cask 'google-chrome-dev' do app 'Google Chrome.app' zap :delete => [ - '~/Library/Application Support/Google/Chrome', - '~/Library/Caches/Google/Chrome', - '~/Library/Caches/com.google.Chrome', - '~/Library/Caches/com.google.Chrome.helper.EH', - '~/Library/Caches/com.google.Keystone.Agent', - '~/Library/Caches/com.google.SoftwareUpdate', - '~/Library/Google/GoogleSoftwareUpdate', - '~/Library/Logs/GoogleSoftwareUpdateAgent.log', + '~/Library/Application Support/Google/Chrome', + '~/Library/Caches/Google/Chrome', + '~/Library/Caches/com.google.Chrome', + '~/Library/Caches/com.google.Chrome.helper.EH', + '~/Library/Caches/com.google.Keystone.Agent', + '~/Library/Caches/com.google.SoftwareUpdate', + '~/Library/Google/GoogleSoftwareUpdate', + '~/Library/Logs/GoogleSoftwareUpdateAgent.log', ], :rmdir => [ - '~/Library/Caches/Google', - '~/Library/Google', + '~/Library/Caches/Google', + '~/Library/Google', ] caveats <<-EOS.undent diff --git a/Casks/google-japanese-ime-dev.rb b/Casks/google-japanese-ime-dev.rb index 3a5976869..292e5e68f 100644 --- a/Casks/google-japanese-ime-dev.rb +++ b/Casks/google-japanese-ime-dev.rb @@ -9,10 +9,10 @@ cask 'google-japanese-ime-dev' do license :gratis pkg 'GoogleJapaneseInput.pkg' - - uninstall :pkgutil => 'com.google.pkg.GoogleJapaneseInput', + + uninstall :pkgutil => 'com.google.pkg.GoogleJapaneseInput', :launchctl => [ - 'com.google.inputmethod.Japanese.Converter', - 'com.google.inputmethod.Japanese.Renderer' + 'com.google.inputmethod.Japanese.Converter', + 'com.google.inputmethod.Japanese.Renderer', ] end diff --git a/Casks/handbrakecli-nightly.rb b/Casks/handbrakecli-nightly.rb index b57a811a7..2bf53ab35 100644 --- a/Casks/handbrakecli-nightly.rb +++ b/Casks/handbrakecli-nightly.rb @@ -7,7 +7,7 @@ cask 'handbrakecli-nightly' do homepage 'https://handbrake.fr' license :gpl - binary 'HandBrakeCLI' - depends_on :macos => '>= :snow_leopard' + + binary 'HandBrakeCLI' end diff --git a/Casks/hearthstone-en-gb.rb b/Casks/hearthstone-en-gb.rb index 9ae2aa944..355c98249 100644 --- a/Casks/hearthstone-en-gb.rb +++ b/Casks/hearthstone-en-gb.rb @@ -5,7 +5,7 @@ cask 'hearthstone-en-gb' do url 'https://eu.battle.net/download/getInstaller?os=mac&installer=Hearthstone-Setup-enGB.zip' name 'Hearthstone' homepage 'http://eu.battle.net/hearthstone/en/' - license :unknown + license :unknown # TODO: change license and remove this comment; ':unknown' is a machine-generated placeholder installer :manual => 'Hearthstone-Setup-enGB.app' end diff --git a/Casks/hearthstone-ko.rb b/Casks/hearthstone-ko.rb index 4ce4efcd0..df773ab0a 100644 --- a/Casks/hearthstone-ko.rb +++ b/Casks/hearthstone-ko.rb @@ -5,7 +5,7 @@ cask 'hearthstone-ko' do url 'http://dist.blizzard.com/downloads/hs-installers/a6029a1d625c79252defff3914fb6e67/retail.1/Hearthstone-Setup-koKR.zip' name 'Hearthstone' homepage 'http://kr.battle.net/hearthstone/ko/' - license :unknown # todo: change license and remove this comment; ':unknown' is a machine-generated placeholder + license :unknown # TODO: change license and remove this comment; ':unknown' is a machine-generated placeholder installer :manual => 'Hearthstone-Setup-koKR.app' end diff --git a/Casks/intellij-idea-ce-eap.rb b/Casks/intellij-idea-ce-eap.rb index ffb27c23c..030dd4f0b 100644 --- a/Casks/intellij-idea-ce-eap.rb +++ b/Casks/intellij-idea-ce-eap.rb @@ -10,11 +10,11 @@ cask 'intellij-idea-ce-eap' do app 'IntelliJ IDEA 16 CE EAP.app' zap :delete => [ - '~/Library/Application Support/IdeaIC16', - '~/Library/Caches/IdeaIC16', - '~/Library/Logs/IdeaIC16', - '~/Library/Preferences/com.jetbrains.intellij.ce.plist', - '~/Library/Preferences/IdeaIC16', - '~/Library/Saved Application State/com.jetbrains.intellij.ce.savedState', + '~/Library/Application Support/IdeaIC16', + '~/Library/Caches/IdeaIC16', + '~/Library/Logs/IdeaIC16', + '~/Library/Preferences/com.jetbrains.intellij.ce.plist', + '~/Library/Preferences/IdeaIC16', + '~/Library/Saved Application State/com.jetbrains.intellij.ce.savedState', ] end diff --git a/Casks/intellij-idea-eap.rb b/Casks/intellij-idea-eap.rb index d4eb3a18d..9289e2860 100644 --- a/Casks/intellij-idea-eap.rb +++ b/Casks/intellij-idea-eap.rb @@ -10,10 +10,10 @@ cask 'intellij-idea-eap' do app 'IntelliJ IDEA 16 EAP.app' zap :delete => [ - '~/Library/Preferences/com.jetbrains.intellij.plist', - '~/Library/Application Support/IntelliJIdea16', - '~/Library/Preferences/IntelliJIdea16', - '~/Library/Caches/IntelliJIdea16', - '~/Library/Logs/IntelliJIdea16', + '~/Library/Preferences/com.jetbrains.intellij.plist', + '~/Library/Application Support/IntelliJIdea16', + '~/Library/Preferences/IntelliJIdea16', + '~/Library/Caches/IntelliJIdea16', + '~/Library/Logs/IntelliJIdea16', ] end diff --git a/Casks/java-beta.rb b/Casks/java-beta.rb index 572ffbfa2..4617e5d62 100644 --- a/Casks/java-beta.rb +++ b/Casks/java-beta.rb @@ -9,36 +9,37 @@ cask 'java-beta' do license :gratis pkg 'JDK 8 Update 72.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" + '/usr/libexec/PlistBuddy', '-c', 'Add :JavaVM:JVMCapabilities: string BundledApp', "/Library/Java/JavaVirtualMachines/jdk#{version}.jdk/Contents/Info.plist" system '/usr/bin/sudo', '-E', '--', - '/usr/libexec/PlistBuddy', '-c', 'Add :JavaVM:JVMCapabilities: string JNI', "/Library/Java/JavaVirtualMachines/jdk#{version}.jdk/Contents/Info.plist" + '/usr/libexec/PlistBuddy', '-c', 'Add :JavaVM:JVMCapabilities: string JNI', "/Library/Java/JavaVirtualMachines/jdk#{version}.jdk/Contents/Info.plist" system '/usr/bin/sudo', '-E', '--', - '/usr/libexec/PlistBuddy', '-c', 'Add :JavaVM:JVMCapabilities: string WebStart', "/Library/Java/JavaVirtualMachines/jdk#{version}.jdk/Contents/Info.plist" + '/usr/libexec/PlistBuddy', '-c', 'Add :JavaVM:JVMCapabilities: string WebStart', "/Library/Java/JavaVirtualMachines/jdk#{version}.jdk/Contents/Info.plist" system '/usr/bin/sudo', '-E', '--', - '/usr/libexec/PlistBuddy', '-c', 'Add :JavaVM:JVMCapabilities: string Applets', "/Library/Java/JavaVirtualMachines/jdk#{version}.jdk/Contents/Info.plist" + '/usr/libexec/PlistBuddy', '-c', 'Add :JavaVM:JVMCapabilities: string Applets', "/Library/Java/JavaVirtualMachines/jdk#{version}.jdk/Contents/Info.plist" system '/usr/bin/sudo', '-E', '--', - '/bin/mkdir', '-p', '--', "/Library/Java/JavaVirtualMachines/jdk#{version}.jdk/Contents/Home/bundle/Libraries" + '/bin/mkdir', '-p', '--', "/Library/Java/JavaVirtualMachines/jdk#{version}.jdk/Contents/Home/bundle/Libraries" system '/usr/bin/sudo', '-E', '--', - '/bin/ln', '-nsf', '--', "/Library/Java/JavaVirtualMachines/jdk#{version}.jdk/Contents/Home/jre/lib/server/libjvm.dylib", "/Library/Java/JavaVirtualMachines/jdk#{version}.jdk/Contents/Home/bundle/Libraries/libserver.dylib" + '/bin/ln', '-nsf', '--', "/Library/Java/JavaVirtualMachines/jdk#{version}.jdk/Contents/Home/jre/lib/server/libjvm.dylib", "/Library/Java/JavaVirtualMachines/jdk#{version}.jdk/Contents/Home/bundle/Libraries/libserver.dylib" if MacOS.release <= :mavericks system '/usr/bin/sudo', '-E', '--', - '/bin/rm', '-rf', '--', '/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK' + '/bin/rm', '-rf', '--', '/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK' system '/usr/bin/sudo', '-E', '--', - '/bin/ln', '-nsf', '--', "/Library/Java/JavaVirtualMachines/jdk#{version}.jdk/Contents", '/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK' + '/bin/ln', '-nsf', '--', "/Library/Java/JavaVirtualMachines/jdk#{version}.jdk/Contents", '/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK' end end uninstall :pkgutil => 'com.oracle.jdk8u72', - :delete => [ - MacOS.release <= :mavericks ? '/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK' : '' - ].keep_if { |v| !v.empty? } - + :delete => [ + MacOS.release <= :mavericks ? '/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK' : '', + ].keep_if { |v| !v.empty? } + zap :delete => [ - '~/Library/Application Support/Oracle/Java', - '~/Library/Caches/com.oracle.java.Java-Updater', - '~/Library/Caches/net.java.openjdk.cmd', + '~/Library/Application Support/Oracle/Java', + '~/Library/Caches/com.oracle.java.Java-Updater', + '~/Library/Caches/net.java.openjdk.cmd', ], :rmdir => '~/Library/Application Support/Oracle/' diff --git a/Casks/java6.rb b/Casks/java6.rb index 825c8fe1c..21350d7ce 100644 --- a/Casks/java6.rb +++ b/Casks/java6.rb @@ -5,7 +5,7 @@ cask 'java6' do url 'https://support.apple.com/downloads/DL1572/en_US/javaforosx.dmg' name 'Java Standard Edition Development Kit' homepage 'https://support.apple.com/kb/DL1572' - license :unknown + license :unknown # TODO: change license and remove this comment; ':unknown' is a machine-generated placeholder pkg 'JavaForOSX.pkg' diff --git a/Casks/java7.rb b/Casks/java7.rb index 5c2d8415c..8081a2f43 100644 --- a/Casks/java7.rb +++ b/Casks/java7.rb @@ -4,43 +4,44 @@ cask 'java7' do url 'http://download.oracle.com/otn-pub/java/jdk/7u80-b15/jdk-7u80-macosx-x64.dmg', :cookies => { - 'oraclelicense' => 'accept-securebackup-cookie' + 'oraclelicense' => 'accept-securebackup-cookie', } name 'Java Standard Edition Development Kit' homepage 'http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html' license :gratis pkg 'JDK 7 Update 80.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" + '/usr/libexec/PlistBuddy', '-c', 'Add :JavaVM:JVMCapabilities: string BundledApp', "/Library/Java/JavaVirtualMachines/jdk#{version}.jdk/Contents/Info.plist" system '/usr/bin/sudo', '-E', '--', - '/usr/libexec/PlistBuddy', '-c', 'Add :JavaVM:JVMCapabilities: string JNI', "/Library/Java/JavaVirtualMachines/jdk#{version}.jdk/Contents/Info.plist" + '/usr/libexec/PlistBuddy', '-c', 'Add :JavaVM:JVMCapabilities: string JNI', "/Library/Java/JavaVirtualMachines/jdk#{version}.jdk/Contents/Info.plist" system '/usr/bin/sudo', '-E', '--', - '/usr/libexec/PlistBuddy', '-c', 'Add :JavaVM:JVMCapabilities: string WebStart', "/Library/Java/JavaVirtualMachines/jdk#{version}.jdk/Contents/Info.plist" + '/usr/libexec/PlistBuddy', '-c', 'Add :JavaVM:JVMCapabilities: string WebStart', "/Library/Java/JavaVirtualMachines/jdk#{version}.jdk/Contents/Info.plist" system '/usr/bin/sudo', '-E', '--', - '/usr/libexec/PlistBuddy', '-c', 'Add :JavaVM:JVMCapabilities: string Applets', "/Library/Java/JavaVirtualMachines/jdk#{version}.jdk/Contents/Info.plist" + '/usr/libexec/PlistBuddy', '-c', 'Add :JavaVM:JVMCapabilities: string Applets', "/Library/Java/JavaVirtualMachines/jdk#{version}.jdk/Contents/Info.plist" system '/usr/bin/sudo', '-E', '--', - '/bin/mkdir', '-p', '--', "/Library/Java/JavaVirtualMachines/jdk#{version}.jdk/Contents/Home/bundle/Libraries" + '/bin/mkdir', '-p', '--', "/Library/Java/JavaVirtualMachines/jdk#{version}.jdk/Contents/Home/bundle/Libraries" system '/usr/bin/sudo', '-E', '--', - '/bin/ln', '-nsf', '--', "/Library/Java/JavaVirtualMachines/jdk#{version}.jdk/Contents/Home/jre/lib/server/libjvm.dylib", "/Library/Java/JavaVirtualMachines/jdk#{version}.jdk/Contents/Home/bundle/Libraries/libserver.dylib" + '/bin/ln', '-nsf', '--', "/Library/Java/JavaVirtualMachines/jdk#{version}.jdk/Contents/Home/jre/lib/server/libjvm.dylib", "/Library/Java/JavaVirtualMachines/jdk#{version}.jdk/Contents/Home/bundle/Libraries/libserver.dylib" if MacOS.release <= :mavericks system '/usr/bin/sudo', '-E', '--', - '/bin/rm', '-rf', '--', '/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK' + '/bin/rm', '-rf', '--', '/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK' system '/usr/bin/sudo', '-E', '--', - '/bin/ln', '-nsf', '--', "/Library/Java/JavaVirtualMachines/jdk#{version}.jdk/Contents", '/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK' + '/bin/ln', '-nsf', '--', "/Library/Java/JavaVirtualMachines/jdk#{version}.jdk/Contents", '/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK' end end uninstall :pkgutil => 'com.oracle.jdk7u80', - :delete => [ - MacOS.release <= :mavericks ? '/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK' : '' - ].keep_if { |v| !v.empty? } - + :delete => [ + MacOS.release <= :mavericks ? '/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK' : '', + ].keep_if { |v| !v.empty? } + zap :delete => [ - '~/Library/Application Support/Oracle/Java', - '~/Library/Caches/com.oracle.java.Java-Updater', - '~/Library/Caches/net.java.openjdk.cmd', + '~/Library/Application Support/Oracle/Java', + '~/Library/Caches/com.oracle.java.Java-Updater', + '~/Library/Caches/net.java.openjdk.cmd', ], :rmdir => '~/Library/Application Support/Oracle/' diff --git a/Casks/java9-beta.rb b/Casks/java9-beta.rb index a5f43da25..bf1073aba 100644 --- a/Casks/java9-beta.rb +++ b/Casks/java9-beta.rb @@ -9,36 +9,37 @@ cask 'java9-beta' do license :gratis pkg 'JDK 9.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" + '/usr/libexec/PlistBuddy', '-c', 'Add :JavaVM:JVMCapabilities: string BundledApp', "/Library/Java/JavaVirtualMachines/jdk#{version}.jdk/Contents/Info.plist" system '/usr/bin/sudo', '-E', '--', - '/usr/libexec/PlistBuddy', '-c', 'Add :JavaVM:JVMCapabilities: string JNI', "/Library/Java/JavaVirtualMachines/jdk#{version}.jdk/Contents/Info.plist" + '/usr/libexec/PlistBuddy', '-c', 'Add :JavaVM:JVMCapabilities: string JNI', "/Library/Java/JavaVirtualMachines/jdk#{version}.jdk/Contents/Info.plist" system '/usr/bin/sudo', '-E', '--', - '/usr/libexec/PlistBuddy', '-c', 'Add :JavaVM:JVMCapabilities: string WebStart', "/Library/Java/JavaVirtualMachines/jdk#{version}.jdk/Contents/Info.plist" + '/usr/libexec/PlistBuddy', '-c', 'Add :JavaVM:JVMCapabilities: string WebStart', "/Library/Java/JavaVirtualMachines/jdk#{version}.jdk/Contents/Info.plist" system '/usr/bin/sudo', '-E', '--', - '/usr/libexec/PlistBuddy', '-c', 'Add :JavaVM:JVMCapabilities: string Applets', "/Library/Java/JavaVirtualMachines/jdk#{version}.jdk/Contents/Info.plist" + '/usr/libexec/PlistBuddy', '-c', 'Add :JavaVM:JVMCapabilities: string Applets', "/Library/Java/JavaVirtualMachines/jdk#{version}.jdk/Contents/Info.plist" system '/usr/bin/sudo', '-E', '--', - '/bin/mkdir', '-p', '--', "/Library/Java/JavaVirtualMachines/jdk#{version}.jdk/Contents/Home/bundle/Libraries" + '/bin/mkdir', '-p', '--', "/Library/Java/JavaVirtualMachines/jdk#{version}.jdk/Contents/Home/bundle/Libraries" system '/usr/bin/sudo', '-E', '--', - '/bin/ln', '-nsf', '--', "/Library/Java/JavaVirtualMachines/jdk#{version}.jdk/Contents/Home/jre/lib/server/libjvm.dylib", "/Library/Java/JavaVirtualMachines/jdk#{version}.jdk/Contents/Home/bundle/Libraries/libserver.dylib" + '/bin/ln', '-nsf', '--', "/Library/Java/JavaVirtualMachines/jdk#{version}.jdk/Contents/Home/jre/lib/server/libjvm.dylib", "/Library/Java/JavaVirtualMachines/jdk#{version}.jdk/Contents/Home/bundle/Libraries/libserver.dylib" if MacOS.release <= :mavericks system '/usr/bin/sudo', '-E', '--', - '/bin/rm', '-rf', '--', '/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK' + '/bin/rm', '-rf', '--', '/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK' system '/usr/bin/sudo', '-E', '--', - '/bin/ln', '-nsf', '--', "/Library/Java/JavaVirtualMachines/jdk#{version}.jdk/Contents", '/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK' + '/bin/ln', '-nsf', '--', "/Library/Java/JavaVirtualMachines/jdk#{version}.jdk/Contents", '/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK' end end uninstall :pkgutil => 'com.oracle.jdk9', - :delete => [ - MacOS.release <= :mavericks ? '/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK' : '' - ].keep_if { |v| !v.empty? } - + :delete => [ + MacOS.release <= :mavericks ? '/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK' : '', + ].keep_if { |v| !v.empty? } + zap :delete => [ - '~/Library/Application Support/Oracle/Java', - '~/Library/Caches/com.oracle.java.Java-Updater', - '~/Library/Caches/net.java.openjdk.cmd', + '~/Library/Application Support/Oracle/Java', + '~/Library/Caches/com.oracle.java.Java-Updater', + '~/Library/Caches/net.java.openjdk.cmd', ], :rmdir => '~/Library/Application Support/Oracle/' diff --git a/Casks/julia-nightly.rb b/Casks/julia-nightly.rb index 856ab92a0..9e044c851 100644 --- a/Casks/julia-nightly.rb +++ b/Casks/julia-nightly.rb @@ -3,15 +3,15 @@ cask 'julia-nightly' do sha256 '60dae0dc7c13800d724f4a6c356ad21fb87d94467ca52dc0915738e0369063b9' # amazonaws.com is the official download host per vendor homepage - url "https://s3.amazonaws.com/julianightlies/bin/osx/x64/#{version.sub(%r{(\d+\.\d+).*},'\1')}/julia-#{version}-osx.dmg" + url "https://s3.amazonaws.com/julianightlies/bin/osx/x64/#{version.sub(%r{(\d+\.\d+).*}, '\1')}/julia-#{version}-osx.dmg" name 'Julia' homepage 'http://julialang.org' license :mit - app "Julia-#{version.sub(%r{(.+)-(.+)},'\1-dev-\2')}.app" - binary "Julia-#{version.sub(%r{(.+)-(.+)},'\1-dev-\2')}.app/Contents/Resources/julia/bin/julia" - depends_on :macos => '>= :lion' + app "Julia-#{version.sub(%r{(.+)-(.+)}, '\1-dev-\2')}.app" + binary "Julia-#{version.sub(%r{(.+)-(.+)}, '\1-dev-\2')}.app/Contents/Resources/julia/bin/julia" + zap :delete => '~/.julia' end diff --git a/Casks/kicad-nightly.rb b/Casks/kicad-nightly.rb index 044e023df..895ffdaae 100644 --- a/Casks/kicad-nightly.rb +++ b/Casks/kicad-nightly.rb @@ -7,6 +7,6 @@ cask 'kicad-nightly' do homepage 'http://www.kicad-pcb.org' license :gpl - artifact 'kicad', :target => Pathname.new(File.expand_path('~')).join('Library/Application Support/kicad') suite 'Kicad' + artifact 'kicad', :target => Pathname.new(File.expand_path('~')).join('Library/Application Support/kicad') end diff --git a/Casks/libreoffice-beta.rb b/Casks/libreoffice-beta.rb index 1f4d96bf2..0111daa26 100644 --- a/Casks/libreoffice-beta.rb +++ b/Casks/libreoffice-beta.rb @@ -3,11 +3,11 @@ cask 'libreoffice-beta' do sha256 '4ff5f22273b7e9e8abaabbbcd62bbbb06c2c90c9c45030f00a324f0cca26f73b' url "https://download.documentfoundation.org/libreoffice/testing/#{version.split('.')[0..2].join('.')}/mac/x86_64/LibreOfficeDev_#{version}_MacOS_x86-64.dmg" - gpg "#{url}.asc", - :key_id => 'c2839ecad9408fbe9531c3e9f434a1efafeeaea3' name 'LibreOfficeDev' homepage 'https://www.libreoffice.org/download/pre-releases/' license :mpl + gpg "#{url}.asc", + :key_id => 'c2839ecad9408fbe9531c3e9f434a1efafeeaea3' app 'LibreOfficeDev.app' end diff --git a/Casks/little-snitch-nightly.rb b/Casks/little-snitch-nightly.rb index 9b8b51356..cc2dcf156 100644 --- a/Casks/little-snitch-nightly.rb +++ b/Casks/little-snitch-nightly.rb @@ -8,11 +8,11 @@ cask 'little-snitch-nightly' do license :commercial installer :manual => 'Little Snitch Installer.app' - + zap :delete => [ - '~/Library/Preferences/at.obdev.LittleSnitchNetworkMonitor.plist', - '~/Library/Application Support/Little Snitch/rules.usr.xpl', - '~/Library/Application Support/Little Snitch/configuration.xpl', - '~/Library/Application Support/Little Snitch/configuration.user.xpl', + '~/Library/Preferences/at.obdev.LittleSnitchNetworkMonitor.plist', + '~/Library/Application Support/Little Snitch/rules.usr.xpl', + '~/Library/Application Support/Little Snitch/configuration.xpl', + '~/Library/Application Support/Little Snitch/configuration.user.xpl', ] end diff --git a/Casks/macaw-indigo.rb b/Casks/macaw-indigo.rb index 278777b7d..fa772e597 100644 --- a/Casks/macaw-indigo.rb +++ b/Casks/macaw-indigo.rb @@ -3,9 +3,9 @@ cask 'macaw-indigo' do sha256 '6f284ca20a7259c76ad8695e9b0522d374dd9e4d61657d39066b9ce9e9c2faea' url "http://indigo.macaw.co/#{version}/MacawIndigo#{version}.dmg" - name 'Macaw Indigo' appcast 'http://indigo.macaw.co/appcast.xml', :checkpoint => 'edbeacf73c56b690aa98a6aedb82c1892c4d79b4bc0a3b87a6094765699793ff' + name 'Macaw Indigo' homepage 'http://indigo.macaw.co/' license :commercial diff --git a/Casks/macvim-kaoriya.rb b/Casks/macvim-kaoriya.rb index 5c07324a1..934ce5a32 100644 --- a/Casks/macvim-kaoriya.rb +++ b/Casks/macvim-kaoriya.rb @@ -7,26 +7,22 @@ cask 'macvim-kaoriya' do sha256 '65917eac17422bef99e4d8c725f8a701d336d7e377231b25e4d53945146f90a2' end - url "https://github.com/splhack/macvim-kaoriya/releases/download/#{version.sub(%r{.*-},'')}/MacVim-KaoriYa-#{version.sub(%r{.*-},'')}.dmg" + url "https://github.com/splhack/macvim-kaoriya/releases/download/#{version.sub(%r{.*-}, '')}/MacVim-KaoriYa-#{version.sub(%r{.*-}, '')}.dmg" appcast 'https://raw.githubusercontent.com/splhack/macvim-kaoriya/master/latest.xml', :checkpoint => '6ead50ae50df4feef5f1e985b9295e19c30c13992cb6794afa991a7f9d5d23f0' - name 'MacVim KaoriYa' homepage 'https://github.com/splhack/macvim-kaoriya' license :oss - app 'MacVim.app' depends_on :macos => '>= :lion' + + app 'MacVim.app' + mvim = 'MacVim.app/Contents/MacOS/mvim' executables = %w[macvim-askpass mvim mvimdiff mview mvimex gvim gvimdiff gview gvimex] executables += %w[vi vim vimdiff view vimex] if ARGV.include? '--override-system-vim' executables.each { |e| binary mvim, :target => e } - zap :delete => [ - '~/Library/Preferences/org.vim.MacVim.LSSharedFileList.plist', - '~/Library/Preferences/org.vim.MacVim.plist', - ] - postflight do system 'ruby', '-i.bak', @@ -35,6 +31,11 @@ cask 'macvim-kaoriya' do staged_path.join(mvim) end + zap :delete => [ + '~/Library/Preferences/org.vim.MacVim.LSSharedFileList.plist', + '~/Library/Preferences/org.vim.MacVim.plist', + ] + caveats do files_in_usr_local <<-EOS.undent diff --git a/Casks/microsoft-office-2011.rb b/Casks/microsoft-office-2011.rb index 517776be4..d88832957 100644 --- a/Casks/microsoft-office-2011.rb +++ b/Casks/microsoft-office-2011.rb @@ -11,43 +11,44 @@ cask 'microsoft-office-2011' do uninstall :pkgutil => 'com.microsoft.office.*', :launchctl => 'com.microsoft.office.licensing.helper' - zap :pkgutil => [ - 'com.microsoft.mau.all.autoupdate.*', - 'com.microsoft.merp.all.errorreporting.*' - ], - :delete => [ - '/Library/LaunchDaemons/com.microsoft.office.licensing.helper.plist', - '/Library/PrivilegedHelperTools/com.microsoft.office.licensing.helper', - '/Library/Application Support/Microsoft/MAU2.0', - '/Library/Application Support/Microsoft/MERP2.0', - '/Library/Preferences/com.microsoft.Excel.plist', - '/Library/Preferences/com.microsoft.Outlook.plist', - '/Library/Preferences/com.microsoft.PlayReady.plist', - '/Library/Preferences/com.microsoft.Powerpoint.plist', - '/Library/Preferences/com.microsoft.Word.plist', - '/Library/Preferences/com.microsoft.office.licensing.plist', - '/Library/Preferences/com.microsoft.outlook.databasedaemon.plist', - '/Library/Preferences/com.microsoft.outlook.officereminders.plist', - '~/Library/Application Support/Microsoft/Office', - '~/Library/Preferences/com.microsoft.Excel.plist', - '~/Library/Preferences/com.microsoft.Outlook.plist', - '~/Library/Preferences/com.microsoft.Powerpoint.plist', - '~/Library/Preferences/com.microsoft.Word.plist', - '~/Library/Preferences/com.microsoft.autoupdate2.plist', - '~/Library/Preferences/com.microsoft.error_reporting.plist', - '~/Library/Preferences/com.microsoft.office.plist', - '~/Library/Preferences/com.microsoft.office.setupassistant.plist', - '~/Library/Preferences/com.microsoft.outlook.databasedaemon.plist', - '~/Library/Preferences/com.microsoft.outlook.office_reminders.plist', - '~/Library/Preferences/com.microsoft.outlook.officereminders.plist', - '~/Documents/Microsoft User Data/Microsoft', - '~/Documents/Microsoft User Data/Office 2011 Identities', - '~/Documents/Microsoft User Data/Outlook Sound Sets', - '~/Documents/Microsoft User Data/Saved Attachments' - ], - :rmdir => [ - '/Library/Application Support/Microsoft', - '~/Library/Application Support/Microsoft', - '~/Documents/Microsoft User Data' - ] + + zap :pkgutil => [ + 'com.microsoft.mau.all.autoupdate.*', + 'com.microsoft.merp.all.errorreporting.*', + ], + :delete => [ + '/Library/LaunchDaemons/com.microsoft.office.licensing.helper.plist', + '/Library/PrivilegedHelperTools/com.microsoft.office.licensing.helper', + '/Library/Application Support/Microsoft/MAU2.0', + '/Library/Application Support/Microsoft/MERP2.0', + '/Library/Preferences/com.microsoft.Excel.plist', + '/Library/Preferences/com.microsoft.Outlook.plist', + '/Library/Preferences/com.microsoft.PlayReady.plist', + '/Library/Preferences/com.microsoft.Powerpoint.plist', + '/Library/Preferences/com.microsoft.Word.plist', + '/Library/Preferences/com.microsoft.office.licensing.plist', + '/Library/Preferences/com.microsoft.outlook.databasedaemon.plist', + '/Library/Preferences/com.microsoft.outlook.officereminders.plist', + '~/Library/Application Support/Microsoft/Office', + '~/Library/Preferences/com.microsoft.Excel.plist', + '~/Library/Preferences/com.microsoft.Outlook.plist', + '~/Library/Preferences/com.microsoft.Powerpoint.plist', + '~/Library/Preferences/com.microsoft.Word.plist', + '~/Library/Preferences/com.microsoft.autoupdate2.plist', + '~/Library/Preferences/com.microsoft.error_reporting.plist', + '~/Library/Preferences/com.microsoft.office.plist', + '~/Library/Preferences/com.microsoft.office.setupassistant.plist', + '~/Library/Preferences/com.microsoft.outlook.databasedaemon.plist', + '~/Library/Preferences/com.microsoft.outlook.office_reminders.plist', + '~/Library/Preferences/com.microsoft.outlook.officereminders.plist', + '~/Documents/Microsoft User Data/Microsoft', + '~/Documents/Microsoft User Data/Office 2011 Identities', + '~/Documents/Microsoft User Data/Outlook Sound Sets', + '~/Documents/Microsoft User Data/Saved Attachments', + ], + :rmdir => [ + '/Library/Application Support/Microsoft', + '~/Library/Application Support/Microsoft', + '~/Documents/Microsoft User Data', + ] end diff --git a/Casks/microsoft-office-de.rb b/Casks/microsoft-office-de.rb index 8e6161bd7..c0865230e 100644 --- a/Casks/microsoft-office-de.rb +++ b/Casks/microsoft-office-de.rb @@ -11,43 +11,44 @@ cask 'microsoft-office-de' do uninstall :pkgutil => 'com.microsoft.office.*', :launchctl => 'com.microsoft.office.licensing.helper' - zap :pkgutil => [ - 'com.microsoft.mau.all.autoupdate.*', - 'com.microsoft.merp.all.errorreporting.*' - ], - :delete => [ - '/Library/LaunchDaemons/com.microsoft.office.licensing.helper.plist', - '/Library/PrivilegedHelperTools/com.microsoft.office.licensing.helper', - '/Library/Application Support/Microsoft/MAU2.0', - '/Library/Application Support/Microsoft/MERP2.0', - '/Library/Preferences/com.microsoft.Excel.plist', - '/Library/Preferences/com.microsoft.Outlook.plist', - '/Library/Preferences/com.microsoft.PlayReady.plist', - '/Library/Preferences/com.microsoft.Powerpoint.plist', - '/Library/Preferences/com.microsoft.Word.plist', - '/Library/Preferences/com.microsoft.office.licensing.plist', - '/Library/Preferences/com.microsoft.outlook.databasedaemon.plist', - '/Library/Preferences/com.microsoft.outlook.officereminders.plist', - '~/Library/Application Support/Microsoft/Office', - '~/Library/Preferences/com.microsoft.Excel.plist', - '~/Library/Preferences/com.microsoft.Outlook.plist', - '~/Library/Preferences/com.microsoft.Powerpoint.plist', - '~/Library/Preferences/com.microsoft.Word.plist', - '~/Library/Preferences/com.microsoft.autoupdate2.plist', - '~/Library/Preferences/com.microsoft.error_reporting.plist', - '~/Library/Preferences/com.microsoft.office.plist', - '~/Library/Preferences/com.microsoft.office.setupassistant.plist', - '~/Library/Preferences/com.microsoft.outlook.databasedaemon.plist', - '~/Library/Preferences/com.microsoft.outlook.office_reminders.plist', - '~/Library/Preferences/com.microsoft.outlook.officereminders.plist', - '~/Documents/Microsoft-Benutzerdaten/Microsoft', - '~/Documents/Microsoft-Benutzerdaten/Office 2011 Identities', - '~/Documents/Microsoft-Benutzerdaten/Outlook Sound Sets', - '~/Documents/Microsoft-Benutzerdaten/Saved Attachments' - ], - :rmdir => [ - '/Library/Application Support/Microsoft', - '~/Library/Application Support/Microsoft', - '~/Documents/Microsoft-Benutzerdaten' - ] + + zap :pkgutil => [ + 'com.microsoft.mau.all.autoupdate.*', + 'com.microsoft.merp.all.errorreporting.*', + ], + :delete => [ + '/Library/LaunchDaemons/com.microsoft.office.licensing.helper.plist', + '/Library/PrivilegedHelperTools/com.microsoft.office.licensing.helper', + '/Library/Application Support/Microsoft/MAU2.0', + '/Library/Application Support/Microsoft/MERP2.0', + '/Library/Preferences/com.microsoft.Excel.plist', + '/Library/Preferences/com.microsoft.Outlook.plist', + '/Library/Preferences/com.microsoft.PlayReady.plist', + '/Library/Preferences/com.microsoft.Powerpoint.plist', + '/Library/Preferences/com.microsoft.Word.plist', + '/Library/Preferences/com.microsoft.office.licensing.plist', + '/Library/Preferences/com.microsoft.outlook.databasedaemon.plist', + '/Library/Preferences/com.microsoft.outlook.officereminders.plist', + '~/Library/Application Support/Microsoft/Office', + '~/Library/Preferences/com.microsoft.Excel.plist', + '~/Library/Preferences/com.microsoft.Outlook.plist', + '~/Library/Preferences/com.microsoft.Powerpoint.plist', + '~/Library/Preferences/com.microsoft.Word.plist', + '~/Library/Preferences/com.microsoft.autoupdate2.plist', + '~/Library/Preferences/com.microsoft.error_reporting.plist', + '~/Library/Preferences/com.microsoft.office.plist', + '~/Library/Preferences/com.microsoft.office.setupassistant.plist', + '~/Library/Preferences/com.microsoft.outlook.databasedaemon.plist', + '~/Library/Preferences/com.microsoft.outlook.office_reminders.plist', + '~/Library/Preferences/com.microsoft.outlook.officereminders.plist', + '~/Documents/Microsoft-Benutzerdaten/Microsoft', + '~/Documents/Microsoft-Benutzerdaten/Office 2011 Identities', + '~/Documents/Microsoft-Benutzerdaten/Outlook Sound Sets', + '~/Documents/Microsoft-Benutzerdaten/Saved Attachments', + ], + :rmdir => [ + '/Library/Application Support/Microsoft', + '~/Library/Application Support/Microsoft', + '~/Documents/Microsoft-Benutzerdaten', + ] end diff --git a/Casks/microsoft-office-ja.rb b/Casks/microsoft-office-ja.rb index 652d06f48..efa07b3a7 100644 --- a/Casks/microsoft-office-ja.rb +++ b/Casks/microsoft-office-ja.rb @@ -11,43 +11,44 @@ cask 'microsoft-office-ja' do uninstall :pkgutil => 'com.microsoft.office.*', :launchctl => 'com.microsoft.office.licensing.helper' - zap :pkgutil => [ - 'com.microsoft.mau.all.autoupdate.*', - 'com.microsoft.merp.all.errorreporting.*' - ], - :delete => [ - '/Library/LaunchDaemons/com.microsoft.office.licensing.helper.plist', - '/Library/PrivilegedHelperTools/com.microsoft.office.licensing.helper', - '/Library/Application Support/Microsoft/MAU2.0', - '/Library/Application Support/Microsoft/MERP2.0', - '/Library/Preferences/com.microsoft.Excel.plist', - '/Library/Preferences/com.microsoft.Outlook.plist', - '/Library/Preferences/com.microsoft.PlayReady.plist', - '/Library/Preferences/com.microsoft.Powerpoint.plist', - '/Library/Preferences/com.microsoft.Word.plist', - '/Library/Preferences/com.microsoft.office.licensing.plist', - '/Library/Preferences/com.microsoft.outlook.databasedaemon.plist', - '/Library/Preferences/com.microsoft.outlook.officereminders.plist', - '~/Library/Application Support/Microsoft/Office', - '~/Library/Preferences/com.microsoft.Excel.plist', - '~/Library/Preferences/com.microsoft.Outlook.plist', - '~/Library/Preferences/com.microsoft.Powerpoint.plist', - '~/Library/Preferences/com.microsoft.Word.plist', - '~/Library/Preferences/com.microsoft.autoupdate2.plist', - '~/Library/Preferences/com.microsoft.error_reporting.plist', - '~/Library/Preferences/com.microsoft.office.plist', - '~/Library/Preferences/com.microsoft.office.setupassistant.plist', - '~/Library/Preferences/com.microsoft.outlook.databasedaemon.plist', - '~/Library/Preferences/com.microsoft.outlook.office_reminders.plist', - '~/Library/Preferences/com.microsoft.outlook.officereminders.plist', - '~/Documents/Microsoft ユーザー データ/Microsoft', - '~/Documents/Microsoft ユーザー データ/Office 2011 Identities', - '~/Documents/Microsoft ユーザー データ/Outlook Sound Sets', - '~/Documents/Microsoft ユーザー データ/Saved Attachments' - ], - :rmdir => [ - '/Library/Application Support/Microsoft', - '~/Library/Application Support/Microsoft', - '~/Documents/Microsoft ユーザー データ' - ] + + zap :pkgutil => [ + 'com.microsoft.mau.all.autoupdate.*', + 'com.microsoft.merp.all.errorreporting.*', + ], + :delete => [ + '/Library/LaunchDaemons/com.microsoft.office.licensing.helper.plist', + '/Library/PrivilegedHelperTools/com.microsoft.office.licensing.helper', + '/Library/Application Support/Microsoft/MAU2.0', + '/Library/Application Support/Microsoft/MERP2.0', + '/Library/Preferences/com.microsoft.Excel.plist', + '/Library/Preferences/com.microsoft.Outlook.plist', + '/Library/Preferences/com.microsoft.PlayReady.plist', + '/Library/Preferences/com.microsoft.Powerpoint.plist', + '/Library/Preferences/com.microsoft.Word.plist', + '/Library/Preferences/com.microsoft.office.licensing.plist', + '/Library/Preferences/com.microsoft.outlook.databasedaemon.plist', + '/Library/Preferences/com.microsoft.outlook.officereminders.plist', + '~/Library/Application Support/Microsoft/Office', + '~/Library/Preferences/com.microsoft.Excel.plist', + '~/Library/Preferences/com.microsoft.Outlook.plist', + '~/Library/Preferences/com.microsoft.Powerpoint.plist', + '~/Library/Preferences/com.microsoft.Word.plist', + '~/Library/Preferences/com.microsoft.autoupdate2.plist', + '~/Library/Preferences/com.microsoft.error_reporting.plist', + '~/Library/Preferences/com.microsoft.office.plist', + '~/Library/Preferences/com.microsoft.office.setupassistant.plist', + '~/Library/Preferences/com.microsoft.outlook.databasedaemon.plist', + '~/Library/Preferences/com.microsoft.outlook.office_reminders.plist', + '~/Library/Preferences/com.microsoft.outlook.officereminders.plist', + '~/Documents/Microsoft ユーザー データ/Microsoft', + '~/Documents/Microsoft ユーザー データ/Office 2011 Identities', + '~/Documents/Microsoft ユーザー データ/Outlook Sound Sets', + '~/Documents/Microsoft ユーザー データ/Saved Attachments', + ], + :rmdir => [ + '/Library/Application Support/Microsoft', + '~/Library/Application Support/Microsoft', + '~/Documents/Microsoft ユーザー データ', + ] end diff --git a/Casks/netbeans-cpp-nightly.rb b/Casks/netbeans-cpp-nightly.rb index afd539eb1..1f310eded 100644 --- a/Casks/netbeans-cpp-nightly.rb +++ b/Casks/netbeans-cpp-nightly.rb @@ -6,7 +6,7 @@ cask 'netbeans-cpp-nightly' do name 'NetBeans IDE for C/C++' homepage 'https://netbeans.org/' license :oss - + pkg "NetBeans Dev #{version}.mpkg" uninstall :delete => '/Applications/NetBeans' diff --git a/Casks/omnifocus-beta.rb b/Casks/omnifocus-beta.rb index b2a5af11f..7608c935e 100644 --- a/Casks/omnifocus-beta.rb +++ b/Casks/omnifocus-beta.rb @@ -10,9 +10,9 @@ cask 'omnifocus-beta' do app 'OmniFocus.app' zap :delete => [ - '~/Library/containers/com.omnigroup.omnifocus2', - '~/Library/Preferences/com.omnigroup.OmniFocus2.LSSharedFileList.plist', - '~/Library/Preferences/com.omnigroup.OmniSoftwareUpdate.plist', - '~/Library/Caches/Metadata/com.omnigroup.OmniFocus2' + '~/Library/containers/com.omnigroup.omnifocus2', + '~/Library/Preferences/com.omnigroup.OmniFocus2.LSSharedFileList.plist', + '~/Library/Preferences/com.omnigroup.OmniSoftwareUpdate.plist', + '~/Library/Caches/Metadata/com.omnigroup.OmniFocus2', ] end diff --git a/Casks/omnipresence-beta.rb b/Casks/omnipresence-beta.rb index 201d36a3b..1112e1799 100644 --- a/Casks/omnipresence-beta.rb +++ b/Casks/omnipresence-beta.rb @@ -7,7 +7,7 @@ cask 'omnipresence-beta' do homepage 'https://www.omnigroup.com/omnipresence' license :commercial - app 'OmniPresence.app' - depends_on :macos => '>= :yosemite' + + app 'OmniPresence.app' end diff --git a/Casks/openemu-experimental.rb b/Casks/openemu-experimental.rb index 98ddc2fdd..4f3fd7123 100644 --- a/Casks/openemu-experimental.rb +++ b/Casks/openemu-experimental.rb @@ -15,31 +15,31 @@ cask 'openemu-experimental' do app 'OpenEmu.app' zap :delete => [ - '~/Library/Application Support/OpenEmu', - '~/Library/Application Support/org.openemu.OEXPCCAgent.Agents', - '~/Library/Caches/org.openemu.OpenEmu', - '~/Library/Preferences/org.openemu.Atari800.plist', - '~/Library/Preferences/org.openemu.Bliss.plist', - '~/Library/Preferences/org.openemu.CrabEmu.plist', - '~/Library/Preferences/org.openemu.desmume.plist', - '~/Library/Preferences/org.openemu.FCEU.plist', - '~/Library/Preferences/org.openemu.Gambatte.plist', - '~/Library/Preferences/org.openemu.GenesisPlus.plist', - '~/Library/Preferences/org.openemu.Higan.plist', - '~/Library/Preferences/org.openemu.Mednafen.plist', - '~/Library/Preferences/org.openemu.Mupen64Plus.plist', - '~/Library/Preferences/org.openemu.NeoPop.plist', - '~/Library/Preferences/org.openemu.Nestopia.plist', - '~/Library/Preferences/org.openemu.O2EM.plist', - '~/Library/Preferences/org.openemu.OpenEmu.plist', - '~/Library/Preferences/org.openemu.Picodrive.plist', - '~/Library/Preferences/org.openemu.PPSSPP.plist', - '~/Library/Preferences/org.openemu.ProSystem.plist', - '~/Library/Preferences/org.openemu.SNES9x.plist', - '~/Library/Preferences/org.openemu.Stella.plist', - '~/Library/Preferences/org.openemu.TwoMbit.plist', - '~/Library/Preferences/org.openemu.VecXGL.plist', - '~/Library/Preferences/org.openemu.VisualBoyAdvance.plist', - '~/Library/Saved Application State/org.openemu.OpenEmu.savedState' + '~/Library/Application Support/OpenEmu', + '~/Library/Application Support/org.openemu.OEXPCCAgent.Agents', + '~/Library/Caches/org.openemu.OpenEmu', + '~/Library/Preferences/org.openemu.Atari800.plist', + '~/Library/Preferences/org.openemu.Bliss.plist', + '~/Library/Preferences/org.openemu.CrabEmu.plist', + '~/Library/Preferences/org.openemu.desmume.plist', + '~/Library/Preferences/org.openemu.FCEU.plist', + '~/Library/Preferences/org.openemu.Gambatte.plist', + '~/Library/Preferences/org.openemu.GenesisPlus.plist', + '~/Library/Preferences/org.openemu.Higan.plist', + '~/Library/Preferences/org.openemu.Mednafen.plist', + '~/Library/Preferences/org.openemu.Mupen64Plus.plist', + '~/Library/Preferences/org.openemu.NeoPop.plist', + '~/Library/Preferences/org.openemu.Nestopia.plist', + '~/Library/Preferences/org.openemu.O2EM.plist', + '~/Library/Preferences/org.openemu.OpenEmu.plist', + '~/Library/Preferences/org.openemu.Picodrive.plist', + '~/Library/Preferences/org.openemu.PPSSPP.plist', + '~/Library/Preferences/org.openemu.ProSystem.plist', + '~/Library/Preferences/org.openemu.SNES9x.plist', + '~/Library/Preferences/org.openemu.Stella.plist', + '~/Library/Preferences/org.openemu.TwoMbit.plist', + '~/Library/Preferences/org.openemu.VecXGL.plist', + '~/Library/Preferences/org.openemu.VisualBoyAdvance.plist', + '~/Library/Saved Application State/org.openemu.OpenEmu.savedState', ] end diff --git a/Casks/opera-beta.rb b/Casks/opera-beta.rb index 48881735c..96a6b3fb9 100644 --- a/Casks/opera-beta.rb +++ b/Casks/opera-beta.rb @@ -3,9 +3,9 @@ cask 'opera-beta' do sha256 '6f20c576e2920b8e821cea4efd0138966ae34d17fbf51bae9e6cbc2d3c2941e9' url "https://get.geo.opera.com/pub/opera-beta/#{version}/mac/Opera_beta_#{version}_Setup.dmg" - name "Opera Beta" + name 'Opera Beta' homepage 'http://www.opera.com/computer/beta' - license :unknown + license :unknown # TODO: change license and remove this comment; ':unknown' is a machine-generated placeholder app 'Opera Beta.app' end diff --git a/Casks/opera-developer.rb b/Casks/opera-developer.rb index 7fcd5aabe..fde17b458 100644 --- a/Casks/opera-developer.rb +++ b/Casks/opera-developer.rb @@ -3,9 +3,9 @@ cask 'opera-developer' do sha256 '0190c061ee2e0bb59830e064a893838d90f7148cce9a886ca0935363da98594f' url "https://get.geo.opera.com/pub/opera-developer/#{version}/mac/Opera_Developer_#{version}_Setup.dmg" - name "Opera Developer" + name 'Opera Developer' homepage 'http://www.opera.com/developer' - license :unknown + license :unknown # TODO: change license and remove this comment; ':unknown' is a machine-generated placeholder app 'Opera Developer.app' end diff --git a/Casks/parallels10.rb b/Casks/parallels10.rb index 0858eae3d..b57d581a3 100644 --- a/Casks/parallels10.rb +++ b/Casks/parallels10.rb @@ -2,7 +2,7 @@ cask 'parallels10' do version '10.3.0-29227' sha256 '71654e1c7f311d9c95f4b78686ebcfcbbb8006fcb57cab39ac817b50c6eed2e3' - url "http://download.parallels.com/desktop/v#{version[/^\w+/]}/#{version.sub(/-.*$/, '')}/ParallelsDesktop-#{version}.dmg" + url "http://download.parallels.com/desktop/v#{version[%r{^\w+}]}/#{version.sub(%r{-.*$}, '')}/ParallelsDesktop-#{version}.dmg" name 'Parallels Desktop' homepage 'https://www.parallels.com/products/desktop/' license :commercial @@ -21,6 +21,7 @@ cask 'parallels10' do '/usr/bin/prlctl', '/usr/bin/prlsrvctl', ] + zap :delete => [ '~/.parallels_settings', '~/Library/Caches/com.parallels.desktop.console', @@ -29,5 +30,5 @@ cask 'parallels10' do '~/Library/Preferences/com.parallels.Parallels Desktop Statistics.plist', '~/Library/Preferences/com.parallels.Parallels Desktop.plist', '~/Library/Preferences/com.parallels.Parallels.plist', - ] + ] end diff --git a/Casks/phpstorm-eap.rb b/Casks/phpstorm-eap.rb index d9c1a9d6d..ad4cb3a01 100644 --- a/Casks/phpstorm-eap.rb +++ b/Casks/phpstorm-eap.rb @@ -10,12 +10,11 @@ cask 'phpstorm-eap' do app 'PhpStorm EAP.app' zap :delete => [ - '~/Library/Application Support/WebIde100', - '~/Library/Caches/WebIde100', - '~/Library/Logs/WebIde100', - '~/Library/Preferences/WebIde100', - '~/Library/Preferences/com.jetbrains.PhpStorm-EAP.plist', - '~/.WebIde100', + '~/Library/Application Support/WebIde100', + '~/Library/Caches/WebIde100', + '~/Library/Logs/WebIde100', + '~/Library/Preferences/WebIde100', + '~/Library/Preferences/com.jetbrains.PhpStorm-EAP.plist', + '~/.WebIde100', ] - end diff --git a/Casks/pokerstarseu.rb b/Casks/pokerstarseu.rb index fb4179c21..7f0fc14bc 100644 --- a/Casks/pokerstarseu.rb +++ b/Casks/pokerstarseu.rb @@ -12,7 +12,7 @@ cask 'pokerstarseu' do app 'PokerStarsEU.app' zap :delete => [ - '~/Library/Preferences/com.pokerstars.eu.user.ini', - '~/Library/Preferences/com.pokerstars.PokerStarsEU.plist', + '~/Library/Preferences/com.pokerstars.eu.user.ini', + '~/Library/Preferences/com.pokerstars.PokerStarsEU.plist', ] end diff --git a/Casks/pycharm-ce-eap.rb b/Casks/pycharm-ce-eap.rb index b72452232..747ec1aac 100644 --- a/Casks/pycharm-ce-eap.rb +++ b/Casks/pycharm-ce-eap.rb @@ -7,16 +7,16 @@ cask 'pycharm-ce-eap' do homepage 'https://confluence.jetbrains.com/display/PYH/JetBrains+PyCharm+Preview+(EAP)' license :apache + conflicts_with :cask => 'pycharm-ce' + app 'PyCharm CE.app' zap :delete => [ - '~/Library/Preferences/com.jetbrains.pycharm.plist', - '~/Library/Preferences/PyCharm50', - '~/Library/Application Support/PyCharm50', - '~/Library/Caches/PyCharm50', - '~/Library/Logs/PyCharm50', - '/usr/local/bin/charm', + '~/Library/Preferences/com.jetbrains.pycharm.plist', + '~/Library/Preferences/PyCharm50', + '~/Library/Application Support/PyCharm50', + '~/Library/Caches/PyCharm50', + '~/Library/Logs/PyCharm50', + '/usr/local/bin/charm', ] - - conflicts_with :cask => 'pycharm-ce' end diff --git a/Casks/pycharm-eap.rb b/Casks/pycharm-eap.rb index bc51e7751..2659bca29 100644 --- a/Casks/pycharm-eap.rb +++ b/Casks/pycharm-eap.rb @@ -7,16 +7,16 @@ cask 'pycharm-eap' do homepage 'https://confluence.jetbrains.com/display/PYH/JetBrains+PyCharm+Preview+(EAP)' license :commercial + conflicts_with :cask => 'pycharm' + app 'PyCharm.app' zap :delete => [ - '~/Library/Preferences/com.jetbrains.pycharm.plist', - '~/Library/Preferences/PyCharm50', - '~/Library/Application Support/PyCharm50', - '~/Library/Caches/PyCharm50', - '~/Library/Logs/PyCharm50', - '/usr/local/bin/charm', + '~/Library/Preferences/com.jetbrains.pycharm.plist', + '~/Library/Preferences/PyCharm50', + '~/Library/Application Support/PyCharm50', + '~/Library/Caches/PyCharm50', + '~/Library/Logs/PyCharm50', + '/usr/local/bin/charm', ] - - conflicts_with :cask => 'pycharm' end diff --git a/Casks/royal-tsx-beta.rb b/Casks/royal-tsx-beta.rb index 3f522c152..0842e9a93 100644 --- a/Casks/royal-tsx-beta.rb +++ b/Casks/royal-tsx-beta.rb @@ -3,9 +3,9 @@ cask 'royal-tsx-beta' do sha256 'abcf55a65d4ffcee7fe90d12ffc26c6f186b1a257b47aa7df6a7290d18c775c3' url "http://v2.royaltsx.com/updates/royaltsx_#{version}.dmg" - name 'Royal TSX' appcast 'http://v2.royaltsx.com/updates_beta.php', :checkpoint => 'f5a30300841e66f37005c35d327498682477c3cf3024bd850af9dd2af7fcd8ec' + name 'Royal TSX' homepage 'http://www.royaltsx.com' license :freemium diff --git a/Casks/rstudio-daily.rb b/Casks/rstudio-daily.rb index 802bb8e7d..86e708922 100644 --- a/Casks/rstudio-daily.rb +++ b/Casks/rstudio-daily.rb @@ -8,6 +8,6 @@ cask 'rstudio-daily' do license :affero app 'RStudio.app' - + zap :delete => '~/.rstudio-desktop' end diff --git a/Casks/rstudio-preview.rb b/Casks/rstudio-preview.rb index e7f9f6468..cff9113b3 100644 --- a/Casks/rstudio-preview.rb +++ b/Casks/rstudio-preview.rb @@ -9,6 +9,6 @@ cask 'rstudio-preview' do license :affero app 'RStudio.app' - + zap :delete => '~/.rstudio-desktop' end diff --git a/Casks/rubymine-eap.rb b/Casks/rubymine-eap.rb index fca6b066f..368be9f6f 100644 --- a/Casks/rubymine-eap.rb +++ b/Casks/rubymine-eap.rb @@ -10,11 +10,11 @@ cask 'rubymine-eap' do app 'RubyMine EAP.app' zap :delete => [ - '~/Library/Preferences/com.jetbrains.rubymine-EAP.plist', - '~/Library/Preferences/RubyMine70', - '~/Library/Application Support/RubyMine70', - '~/Library/Caches/RubyMine70', - '~/Library/Logs/RubyMine70', - '/usr/local/bin/mine', + '~/Library/Preferences/com.jetbrains.rubymine-EAP.plist', + '~/Library/Preferences/RubyMine70', + '~/Library/Application Support/RubyMine70', + '~/Library/Caches/RubyMine70', + '~/Library/Logs/RubyMine70', + '/usr/local/bin/mine', ] end diff --git a/Casks/scansnap-manager-s1300.rb b/Casks/scansnap-manager-s1300.rb index 87caa8e21..213c856f0 100644 --- a/Casks/scansnap-manager-s1300.rb +++ b/Casks/scansnap-manager-s1300.rb @@ -7,9 +7,9 @@ cask 'scansnap-manager-s1300' do homepage 'https://www.fujitsu.com/global/support/computing/peripheral/scanners/software/s1300m-setup.html' license :gratis + depends_on :macos => '>= :tiger' + pkg 'Scansnap Manager.pkg' - - uninstall :pkgutil => 'jp.co.pfu.ScanSnap.V10L10' - depends_on :macos => '>= :tiger' + uninstall :pkgutil => 'jp.co.pfu.ScanSnap.V10L10' end diff --git a/Casks/scansnap-manager-s300m-s500m-s510m-fi-5110eoxm-legacy.rb b/Casks/scansnap-manager-s300m-s500m-s510m-fi-5110eoxm-legacy.rb index 6a882f931..d7fef1417 100644 --- a/Casks/scansnap-manager-s300m-s500m-s510m-fi-5110eoxm-legacy.rb +++ b/Casks/scansnap-manager-s300m-s500m-s510m-fi-5110eoxm-legacy.rb @@ -7,24 +7,24 @@ cask 'scansnap-manager-s300m-s500m-s510m-fi-5110eoxm-legacy' do homepage 'https://www.fujitsu.com/global/support/computing/peripheral/scanners/software/mac.html' license :gratis - pkg 'ScanSnap_V22L11.pkg' + depends_on :macos => [:tiger, :leopard] - caveats "Install cask `scansnap-manager-s300m-s510m` after to update for compatibility with OS X 10.6+" + pkg 'ScanSnap_V22L11.pkg' uninstall :pkgutil => 'jp.co.pfu.ScanSnap.V10L10', - :quit => [ - 'jp.co.ScanSnap.Scan2PrintBundle', - 'jp.co.pfu.SSPDF2Image', - 'jp.co.pfu.ScanSnap.P2IUNISET', - 'jp.co.pfu.ScanSnap.QuickMenu', - 'jp.co.pfu.ScanSnap.SSLog', - 'jp.co.pfu.ScanSnap.STMApp', - 'jp.co.pfu.ScanSnap.STPApp', - 'jp.co.pfu.ScanSnap.STPPDE', - 'jp.co.pfu.ScanSnap.Scan2Mail', - 'jp.co.pfu.ScanSnap.ScanToFolder', - 'jp.co.pfu.ScanSnap.V10L10' - ] + :quit => [ + 'jp.co.ScanSnap.Scan2PrintBundle', + 'jp.co.pfu.SSPDF2Image', + 'jp.co.pfu.ScanSnap.P2IUNISET', + 'jp.co.pfu.ScanSnap.QuickMenu', + 'jp.co.pfu.ScanSnap.SSLog', + 'jp.co.pfu.ScanSnap.STMApp', + 'jp.co.pfu.ScanSnap.STPApp', + 'jp.co.pfu.ScanSnap.STPPDE', + 'jp.co.pfu.ScanSnap.Scan2Mail', + 'jp.co.pfu.ScanSnap.ScanToFolder', + 'jp.co.pfu.ScanSnap.V10L10', + ] - depends_on :macos => [:tiger, :leopard] + caveats 'Install cask `scansnap-manager-s300m-s510m` after to update for compatibility with OS X 10.6+' end diff --git a/Casks/scansnap-manager-s300m-s510m.rb b/Casks/scansnap-manager-s300m-s510m.rb index f131b9631..6fe3a540d 100644 --- a/Casks/scansnap-manager-s300m-s510m.rb +++ b/Casks/scansnap-manager-s300m-s510m.rb @@ -7,23 +7,23 @@ cask 'scansnap-manager-s300m-s510m' do homepage 'https://www.fujitsu.com/global/support/computing/peripheral/scanners/software/mac-mg22-eol.html' license :gratis + depends_on :cask => 'scansnap-manager-s300m-s500m-s510m-fi-5110eoxm-legacy' + depends_on :macos => '>= :snow_leopard' + pkg 'ScanSnap_V22L16.pkg' uninstall :pkgutil => 'jp.co.pfu.ScanSnap.V22L16', - :quit => [ - 'jp.co.ScanSnap.Scan2PrintBundle', - 'jp.co.pfu.SSPDF2Image', - 'jp.co.pfu.ScanSnap.P2IUNISET', - 'jp.co.pfu.ScanSnap.QuickMenu', - 'jp.co.pfu.ScanSnap.SSLog', - 'jp.co.pfu.ScanSnap.STMApp', - 'jp.co.pfu.ScanSnap.STPApp', - 'jp.co.pfu.ScanSnap.STPPDE', - 'jp.co.pfu.ScanSnap.Scan2Mail', - 'jp.co.pfu.ScanSnap.ScanToFolder', - 'jp.co.pfu.ScanSnap.V10L10' - ] - - depends_on :cask => 'scansnap-manager-s300m-s500m-s510m-fi-5110eoxm-legacy' - depends_on :macos => '>= :snow_leopard' + :quit => [ + 'jp.co.ScanSnap.Scan2PrintBundle', + 'jp.co.pfu.SSPDF2Image', + 'jp.co.pfu.ScanSnap.P2IUNISET', + 'jp.co.pfu.ScanSnap.QuickMenu', + 'jp.co.pfu.ScanSnap.SSLog', + 'jp.co.pfu.ScanSnap.STMApp', + 'jp.co.pfu.ScanSnap.STPApp', + 'jp.co.pfu.ScanSnap.STPPDE', + 'jp.co.pfu.ScanSnap.Scan2Mail', + 'jp.co.pfu.ScanSnap.ScanToFolder', + 'jp.co.pfu.ScanSnap.V10L10', + ] end diff --git a/Casks/scansnap-manager-sv600.rb b/Casks/scansnap-manager-sv600.rb index 38636d6cd..b9a395a25 100644 --- a/Casks/scansnap-manager-sv600.rb +++ b/Casks/scansnap-manager-sv600.rb @@ -2,14 +2,14 @@ cask 'scansnap-manager-sv600' do version '6.2L10' sha256 '7273034398e9a57eb0fa89167c9e801ad2bf9fe56b52b3d9591628e978168afb' - url "https://www.fujitsu.com/downloads/IMAGE/driver/ss/mgr/m-sv600/MacScanSnapV#{version.gsub('.','')}WW.dmg" - name "ScanSnap Manager for Fujitsu ScanSnap SV600" + url "https://www.fujitsu.com/downloads/IMAGE/driver/ss/mgr/m-sv600/MacScanSnapV#{version.gsub('.', '')}WW.dmg" + name 'ScanSnap Manager for Fujitsu ScanSnap SV600' homepage 'https://www.fujitsu.com/global/support/computing/peripheral/scanners/software/' license :gratis + depends_on :macos => '>= :lion' + pkg 'ScanSnap Manager.pkg' uninstall :pkgutil => 'jp.co.pfu.ScanSnap.*' - - depends_on :macos => '>= :lion' end diff --git a/Casks/sketchup-pro.rb b/Casks/sketchup-pro.rb index 1401bc541..b4a0ec5e4 100644 --- a/Casks/sketchup-pro.rb +++ b/Casks/sketchup-pro.rb @@ -7,12 +7,12 @@ cask 'sketchup-pro' do url 'https://dl.trimble.com/sketchup/SketchUpPro-en.dmg' name 'SketchUp' homepage 'https://www.sketchup.com/intl/en/' - license :unknown # todo: change license and remove this comment; ':unknown' is a machine-generated placeholder + license :unknown # TODO: change license and remove this comment; ':unknown' is a machine-generated placeholder suite 'SketchUp 2016' zap :delete => [ - '~/Library/Application Support/SketchUp 2016', - '~/Library/Caches/com.sketchup.SketchUp.2016', + '~/Library/Application Support/SketchUp 2016', + '~/Library/Caches/com.sketchup.SketchUp.2016', ] end diff --git a/Casks/sublime-text-dev.rb b/Casks/sublime-text-dev.rb index fdb70c0f0..c66ce4e1a 100644 --- a/Casks/sublime-text-dev.rb +++ b/Casks/sublime-text-dev.rb @@ -10,20 +10,20 @@ cask 'sublime-text-dev' do homepage 'https://www.sublimetext.com/3dev' license :closed + conflicts_with :cask => 'caskroom/versions/sublime-text3' + app 'Sublime Text.app' binary 'Sublime Text.app/Contents/SharedSupport/bin/subl' uninstall :quit => 'com.sublimetext.3' zap :delete => [ - '~/Library/Application Support/Sublime Text 3', - '~/Library/Caches/com.sublimetext.3', - '~/Library/Preferences/com.sublimetext.3.plist', - '~/Library/Saved Application State/com.sublimetext.3.savedState' + '~/Library/Application Support/Sublime Text 3', + '~/Library/Caches/com.sublimetext.3', + '~/Library/Preferences/com.sublimetext.3.plist', + '~/Library/Saved Application State/com.sublimetext.3.savedState', ] - conflicts_with :cask => 'caskroom/versions/sublime-text3' - caveats do files_in_usr_local end diff --git a/Casks/sublime-text3.rb b/Casks/sublime-text3.rb index eba269a50..0d3882934 100644 --- a/Casks/sublime-text3.rb +++ b/Casks/sublime-text3.rb @@ -10,20 +10,20 @@ cask 'sublime-text3' do homepage 'https://www.sublimetext.com/3' license :closed + conflicts_with :cask => 'caskroom/versions/sublime-text-dev' + app 'Sublime Text.app' binary 'Sublime Text.app/Contents/SharedSupport/bin/subl' uninstall :quit => 'com.sublimetext.3' zap :delete => [ - '~/Library/Application Support/Sublime Text 3', - '~/Library/Caches/com.sublimetext.3', - '~/Library/Preferences/com.sublimetext.3.plist', - '~/Library/Saved Application State/com.sublimetext.3.savedState' + '~/Library/Application Support/Sublime Text 3', + '~/Library/Caches/com.sublimetext.3', + '~/Library/Preferences/com.sublimetext.3.plist', + '~/Library/Saved Application State/com.sublimetext.3.savedState', ] - conflicts_with :cask => 'caskroom/versions/sublime-text-dev' - caveats do files_in_usr_local end diff --git a/Casks/torbrowser-alpha.rb b/Casks/torbrowser-alpha.rb index 6514845aa..ce55dff6c 100644 --- a/Casks/torbrowser-alpha.rb +++ b/Casks/torbrowser-alpha.rb @@ -3,14 +3,14 @@ cask 'torbrowser-alpha' do sha256 '1cc6b9316b2ca9246e15ff5489d0d2536b8e2e38efd87e4c24ffad2b2950a428' url "https://dist.torproject.org/torbrowser/#{version}/TorBrowser-#{version}-osx64_en-US.dmg" - gpg "#{url}.asc", - :key_id => 'ef6e286dda85ea2a4ba7de684e2c6e8793298290' name 'Tor Browser' homepage 'https://www.torproject.org/projects/torbrowser.html' license :oss - + gpg "#{url}.asc", + :key_id => 'ef6e286dda85ea2a4ba7de684e2c6e8793298290' + app 'TorBrowser.app' - + caveats <<-EOS.undent If you already have a version of TorBrowser installed this will overwrite your local settings. It is recommended to use TorBrowser's built-in update mechanism after the first install to keep your settings. diff --git a/Casks/torbrowser-ar.rb b/Casks/torbrowser-ar.rb index c8c5c005d..8f8851035 100644 --- a/Casks/torbrowser-ar.rb +++ b/Casks/torbrowser-ar.rb @@ -3,11 +3,11 @@ cask 'torbrowser-ar' do sha256 'e158d7350fb832db5ced52467e0483282bceba2bb9df37359340040123311326' url "https://dist.torproject.org/torbrowser/#{version}/TorBrowser-#{version}-osx64_ar.dmg" - gpg "#{url}.asc", - :key_id => 'ef6e286dda85ea2a4ba7de684e2c6e8793298290' name 'Tor Browser' homepage 'https://www.torproject.org/projects/torbrowser.html' license :oss + gpg "#{url}.asc", + :key_id => 'ef6e286dda85ea2a4ba7de684e2c6e8793298290' app 'TorBrowser.app' end diff --git a/Casks/torbrowser-cn.rb b/Casks/torbrowser-cn.rb index 8df42387d..bdea96dd5 100644 --- a/Casks/torbrowser-cn.rb +++ b/Casks/torbrowser-cn.rb @@ -3,11 +3,11 @@ cask 'torbrowser-cn' do sha256 'a1e0d85b2ed42fa622520873882d166cb13a968e868de8a65e086e3c61b207c0' url "https://dist.torproject.org/torbrowser/#{version}/TorBrowser-#{version}-osx64_zh-CN.dmg" - gpg "#{url}.asc", - :key_id => 'ef6e286dda85ea2a4ba7de684e2c6e8793298290' name 'Tor Browser' homepage 'https://www.torproject.org/projects/torbrowser.html' license :oss + gpg "#{url}.asc", + :key_id => 'ef6e286dda85ea2a4ba7de684e2c6e8793298290' app 'TorBrowser.app' end diff --git a/Casks/torbrowser-de.rb b/Casks/torbrowser-de.rb index ed06939e3..e4a43b450 100644 --- a/Casks/torbrowser-de.rb +++ b/Casks/torbrowser-de.rb @@ -3,11 +3,11 @@ cask 'torbrowser-de' do sha256 '84f4c22558bb3d41955f326cc8cfb82b4774304ec2cab2f142b6443e72320cf8' url "https://dist.torproject.org/torbrowser/#{version}/TorBrowser-#{version}-osx64_de.dmg" - gpg "#{url}.asc", - :key_id => 'ef6e286dda85ea2a4ba7de684e2c6e8793298290' name 'Tor Browser' homepage 'https://www.torproject.org/projects/torbrowser.html' license :oss + gpg "#{url}.asc", + :key_id => 'ef6e286dda85ea2a4ba7de684e2c6e8793298290' app 'TorBrowser.app' end diff --git a/Casks/torbrowser-es.rb b/Casks/torbrowser-es.rb index cccdaf907..3f0ef436c 100644 --- a/Casks/torbrowser-es.rb +++ b/Casks/torbrowser-es.rb @@ -3,11 +3,11 @@ cask 'torbrowser-es' do sha256 '3d293c4b5f093b39e68e35a1c9083f12aab35d6c22f90a38a4760d6b178d4e85' url "https://dist.torproject.org/torbrowser/#{version}/TorBrowser-#{version}-osx64_es-ES.dmg" - gpg "#{url}.asc", - :key_id => 'ef6e286dda85ea2a4ba7de684e2c6e8793298290' name 'Tor Browser' homepage 'https://www.torproject.org/projects/torbrowser.html' license :oss + gpg "#{url}.asc", + :key_id => 'ef6e286dda85ea2a4ba7de684e2c6e8793298290' app 'TorBrowser.app' end diff --git a/Casks/torbrowser-fa.rb b/Casks/torbrowser-fa.rb index c99f803f2..ff5145311 100644 --- a/Casks/torbrowser-fa.rb +++ b/Casks/torbrowser-fa.rb @@ -3,11 +3,11 @@ cask 'torbrowser-fa' do sha256 'd7c266358dbfbef5f91db15addf011bcb6eb0f269ee917c8f38ad3d45431a8f1' url "https://dist.torproject.org/torbrowser/#{version}/TorBrowser-#{version}-osx64_fa.dmg" - gpg "#{url}.asc", - :key_id => 'ef6e286dda85ea2a4ba7de684e2c6e8793298290' name 'Tor Browser' homepage 'https://www.torproject.org/projects/torbrowser.html' license :oss + gpg "#{url}.asc", + :key_id => 'ef6e286dda85ea2a4ba7de684e2c6e8793298290' app 'TorBrowser.app' end diff --git a/Casks/torbrowser-fr.rb b/Casks/torbrowser-fr.rb index 63de25c56..ac1375dfb 100644 --- a/Casks/torbrowser-fr.rb +++ b/Casks/torbrowser-fr.rb @@ -3,11 +3,11 @@ cask 'torbrowser-fr' do sha256 'b7cde0c92bdfb97fbd686e89009c5dd9ccfa5ec5cd3b5522465ba5d43623a6c8' url "https://dist.torproject.org/torbrowser/#{version}/TorBrowser-#{version}-osx64_fr.dmg" - gpg "#{url}.asc", - :key_id => 'ef6e286dda85ea2a4ba7de684e2c6e8793298290' name 'Tor Browser' homepage 'https://www.torproject.org/projects/torbrowser.html' license :oss + gpg "#{url}.asc", + :key_id => 'ef6e286dda85ea2a4ba7de684e2c6e8793298290' app 'TorBrowser.app' end diff --git a/Casks/torbrowser-it.rb b/Casks/torbrowser-it.rb index 6f5752e2d..75d0cbb3a 100644 --- a/Casks/torbrowser-it.rb +++ b/Casks/torbrowser-it.rb @@ -3,11 +3,11 @@ cask 'torbrowser-it' do sha256 'a88a51afbfb7e86d229009302754a066a141a74a97c84054b99db1b0b7a208b5' url "https://dist.torproject.org/torbrowser/#{version}/TorBrowser-#{version}-osx64_it.dmg" - gpg "#{url}.asc", - :key_id => 'ef6e286dda85ea2a4ba7de684e2c6e8793298290' name 'Tor Browser' homepage 'https://www.torproject.org/projects/torbrowser.html' license :oss + gpg "#{url}.asc", + :key_id => 'ef6e286dda85ea2a4ba7de684e2c6e8793298290' app 'TorBrowser.app' end diff --git a/Casks/torbrowser-ko.rb b/Casks/torbrowser-ko.rb index 8ab6a3bfe..c5127678c 100644 --- a/Casks/torbrowser-ko.rb +++ b/Casks/torbrowser-ko.rb @@ -3,11 +3,11 @@ cask 'torbrowser-ko' do sha256 '80036233651b7b273e48d3a5afd675663ca67cc905d3417904ce837901403325' url "https://dist.torproject.org/torbrowser/#{version}/TorBrowser-#{version}-osx64_ko.dmg" - gpg "#{url}.asc", - :key_id => 'ef6e286dda85ea2a4ba7de684e2c6e8793298290' name 'Tor Browser' homepage 'https://www.torproject.org/projects/torbrowser.html' license :oss + gpg "#{url}.asc", + :key_id => 'ef6e286dda85ea2a4ba7de684e2c6e8793298290' app 'TorBrowser.app' end diff --git a/Casks/torbrowser-nl.rb b/Casks/torbrowser-nl.rb index 4a920b4a4..4abf841b8 100644 --- a/Casks/torbrowser-nl.rb +++ b/Casks/torbrowser-nl.rb @@ -3,11 +3,11 @@ cask 'torbrowser-nl' do sha256 '114d63966962b9a865cef607dc65315bb1a18f61eba7b019ec603c85393c3cf7' url "https://dist.torproject.org/torbrowser/#{version}/TorBrowser-#{version}-osx64_nl.dmg" - gpg "#{url}.asc", - :key_id => 'ef6e286dda85ea2a4ba7de684e2c6e8793298290' name 'Tor Browser' homepage 'https://www.torproject.org/projects/torbrowser.html' license :oss + gpg "#{url}.asc", + :key_id => 'ef6e286dda85ea2a4ba7de684e2c6e8793298290' app 'TorBrowser.app' end diff --git a/Casks/torbrowser-pl.rb b/Casks/torbrowser-pl.rb index cd6ef4e1e..49db062cf 100644 --- a/Casks/torbrowser-pl.rb +++ b/Casks/torbrowser-pl.rb @@ -3,11 +3,11 @@ cask 'torbrowser-pl' do sha256 'c87905e4dcb4bd2b417b7fcf3c0ca47d4eb7168eef08c7a413ed839061fd8397' url "https://dist.torproject.org/torbrowser/#{version}/TorBrowser-#{version}-osx64_pl.dmg" - gpg "#{url}.asc", - :key_id => 'ef6e286dda85ea2a4ba7de684e2c6e8793298290' name 'Tor Browser' homepage 'https://www.torproject.org/projects/torbrowser.html' license :oss + gpg "#{url}.asc", + :key_id => 'ef6e286dda85ea2a4ba7de684e2c6e8793298290' app 'TorBrowser.app' end diff --git a/Casks/torbrowser-pt.rb b/Casks/torbrowser-pt.rb index a70342833..733f1d396 100644 --- a/Casks/torbrowser-pt.rb +++ b/Casks/torbrowser-pt.rb @@ -3,11 +3,11 @@ cask 'torbrowser-pt' do sha256 '8ee3d70088093cd64e41f2c5531e6f5bc73bfa346083c8340ef8db08508f03d9' url "https://dist.torproject.org/torbrowser/#{version}/TorBrowser-#{version}-osx64_pt-PT.dmg" - gpg "#{url}.asc", - :key_id => 'ef6e286dda85ea2a4ba7de684e2c6e8793298290' name 'Tor Browser' homepage 'https://www.torproject.org/projects/torbrowser.html' license :oss + gpg "#{url}.asc", + :key_id => 'ef6e286dda85ea2a4ba7de684e2c6e8793298290' app 'TorBrowser.app' end diff --git a/Casks/torbrowser-ru.rb b/Casks/torbrowser-ru.rb index bbf202117..36f20ada3 100644 --- a/Casks/torbrowser-ru.rb +++ b/Casks/torbrowser-ru.rb @@ -3,11 +3,11 @@ cask 'torbrowser-ru' do sha256 '6f1397ce060cbd7130452a5a0e1031c07452a14f54cadab5375f150033756226' url "https://dist.torproject.org/torbrowser/#{version}/TorBrowser-#{version}-osx64_ru.dmg" - gpg "#{url}.asc", - :key_id => 'ef6e286dda85ea2a4ba7de684e2c6e8793298290' name 'Tor Browser' homepage 'https://www.torproject.org/projects/torbrowser.html' license :oss + gpg "#{url}.asc", + :key_id => 'ef6e286dda85ea2a4ba7de684e2c6e8793298290' app 'TorBrowser.app' end diff --git a/Casks/torbrowser-tr.rb b/Casks/torbrowser-tr.rb index 5f3ffc21e..822ffa024 100644 --- a/Casks/torbrowser-tr.rb +++ b/Casks/torbrowser-tr.rb @@ -3,11 +3,11 @@ cask 'torbrowser-tr' do sha256 '6cd4dede3b0d90169437a2b4874a98f2122902bdc054f4ba3f6eb19b05b9288e' url "https://dist.torproject.org/torbrowser/#{version}/TorBrowser-#{version}-osx64_tr.dmg" - gpg "#{url}.asc", - :key_id => 'ef6e286dda85ea2a4ba7de684e2c6e8793298290' name 'Tor Browser' homepage 'https://www.torproject.org/projects/torbrowser.html' license :oss + gpg "#{url}.asc", + :key_id => 'ef6e286dda85ea2a4ba7de684e2c6e8793298290' app 'TorBrowser.app' end diff --git a/Casks/torbrowser-vi.rb b/Casks/torbrowser-vi.rb index b87dfc91c..75bcfaad0 100644 --- a/Casks/torbrowser-vi.rb +++ b/Casks/torbrowser-vi.rb @@ -3,11 +3,11 @@ cask 'torbrowser-vi' do sha256 'b25ef10c19b409bdd5e1ecb2a705b21656f50b345e5672aaf04dba519b238e71' url "https://dist.torproject.org/torbrowser/#{version}/TorBrowser-#{version}-osx64_vi.dmg" - gpg "#{url}.asc", - :key_id => 'ef6e286dda85ea2a4ba7de684e2c6e8793298290' name 'Tor Browser' homepage 'https://www.torproject.org/projects/torbrowser.html' license :oss + gpg "#{url}.asc", + :key_id => 'ef6e286dda85ea2a4ba7de684e2c6e8793298290' app 'TorBrowser.app' end diff --git a/Casks/tower-beta.rb b/Casks/tower-beta.rb index 6dd95a844..73ac1fab1 100644 --- a/Casks/tower-beta.rb +++ b/Casks/tower-beta.rb @@ -14,9 +14,9 @@ cask 'tower-beta' do binary 'Tower.app/Contents/MacOS/gittower' zap :delete => [ - '~/Library/Application Support/com.fournova.Tower2', - '~/Library/Caches/com.fournova.Tower2', - '~/Library/Preferences/com.fournova.Tower2.plist', + '~/Library/Application Support/com.fournova.Tower2', + '~/Library/Caches/com.fournova.Tower2', + '~/Library/Preferences/com.fournova.Tower2.plist', ] caveats do diff --git a/Casks/transmission-nightly.rb b/Casks/transmission-nightly.rb index 1d6260add..6e5f0b10e 100644 --- a/Casks/transmission-nightly.rb +++ b/Casks/transmission-nightly.rb @@ -10,10 +10,10 @@ cask 'transmission-nightly' do app 'Transmission.app' zap :delete => [ - '~/Library/Application Support/Transmission', - '~/Library/Preferences/org.m0k.transmission.plist', - '~/Library/Preferences/org.m0k.transmission.LSSharedFileList.plist', - '~/Library/Caches/org.m0k.transmission', - '~/Library/Saved Application State/org.m0k.transmission.savedState' + '~/Library/Application Support/Transmission', + '~/Library/Preferences/org.m0k.transmission.plist', + '~/Library/Preferences/org.m0k.transmission.LSSharedFileList.plist', + '~/Library/Caches/org.m0k.transmission', + '~/Library/Saved Application State/org.m0k.transmission.savedState', ] end diff --git a/Casks/tunnelblick-beta.rb b/Casks/tunnelblick-beta.rb index eac0bc8f8..549100b52 100644 --- a/Casks/tunnelblick-beta.rb +++ b/Casks/tunnelblick-beta.rb @@ -9,13 +9,13 @@ cask 'tunnelblick-beta' do homepage 'https://tunnelblick.net' license :gpl + depends_on :macos => '>= :tiger' + app 'Tunnelblick.app' uninstall :launchctl => 'net.tunnelblick.tunnelblick.LaunchAtLogin', :quit => 'net.tunnelblick.tunnelblick' - depends_on :macos => '>= :tiger' - caveats <<-EOS.undent For security reasons, #{token} must be installed to /Applications, and will request to be moved at launch. diff --git a/Casks/utorrent-beta.rb b/Casks/utorrent-beta.rb index ca71eb253..1827c0494 100644 --- a/Casks/utorrent-beta.rb +++ b/Casks/utorrent-beta.rb @@ -7,15 +7,15 @@ cask 'utorrent-beta' do homepage 'https://www.utorrent.com/' license :freemium + app 'uTorrent.app' + zap :delete => [ - '~/Library/Application Support/uTorrent', - '~/Library/Preferences/com.bittorrent.uTorrent.plist', - '~/Library/Preferences/com.bittorrent.uTorrent-Installer.plist', - '~/Library/Saved Application State/com.bittorrent.uTorrent.savedState', - '~/Library/Saved Application State/com.bittorrent.uTorrent-Installer.savedState', - '~/Library/Caches/com.bittorrent.uTorrent', - '~/Library/Caches/com.bittorrent.uTorrent-Installer' + '~/Library/Application Support/uTorrent', + '~/Library/Preferences/com.bittorrent.uTorrent.plist', + '~/Library/Preferences/com.bittorrent.uTorrent-Installer.plist', + '~/Library/Saved Application State/com.bittorrent.uTorrent.savedState', + '~/Library/Saved Application State/com.bittorrent.uTorrent-Installer.savedState', + '~/Library/Caches/com.bittorrent.uTorrent', + '~/Library/Caches/com.bittorrent.uTorrent-Installer', ] - - app 'uTorrent.app' end diff --git a/Casks/virtualbox-beta.rb b/Casks/virtualbox-beta.rb index 79d26c17b..c37f99b7e 100644 --- a/Casks/virtualbox-beta.rb +++ b/Casks/virtualbox-beta.rb @@ -11,6 +11,6 @@ cask 'virtualbox-beta' do binary '/Applications/VirtualBox.app/Contents/MacOS/VBoxManage' binary '/Applications/VirtualBox.app/Contents/MacOS/VBoxHeadless' - uninstall :script => { :executable => 'VirtualBox_Uninstall.tool', :args => %w[--unattended] }, + uninstall :script => { :executable => 'VirtualBox_Uninstall.tool', :args => %w[--unattended] }, :pkgutil => 'org.virtualbox.pkg.*' end diff --git a/Casks/vmware-fusion6.rb b/Casks/vmware-fusion6.rb index 754f0ad95..49ff076ae 100644 --- a/Casks/vmware-fusion6.rb +++ b/Casks/vmware-fusion6.rb @@ -7,9 +7,9 @@ cask 'vmware-fusion6' do homepage 'https://www.vmware.com/products/fusion/' license :commercial - binary 'VMware Fusion.app/Contents/Library/vmrun' app 'VMware Fusion.app' - + binary 'VMware Fusion.app/Contents/Library/vmrun' + uninstall_preflight do system '/usr/bin/sudo', '-E', '--', '/usr/sbin/chown', '-R', '--', "#{Etc.getpwuid(Process.euid).name}:staff", "#{staged_path}/VMware Fusion.app" diff --git a/Casks/vmware-fusion7.rb b/Casks/vmware-fusion7.rb index cc0a00243..1bc156eb4 100644 --- a/Casks/vmware-fusion7.rb +++ b/Casks/vmware-fusion7.rb @@ -7,22 +7,22 @@ cask 'vmware-fusion7' do homepage 'https://www.vmware.com/products/fusion/' license :commercial + app 'VMware Fusion.app' binary 'VMware Fusion.app/Contents/Library/vmnet-cfgcli' binary 'VMware Fusion.app/Contents/Library/vmnet-cli' binary 'VMware Fusion.app/Contents/Library/vmrun' binary 'VMware Fusion.app/Contents/Library/vmware-vdiskmanager' binary 'VMware Fusion.app/Contents/Library/VMware OVF Tool/ovftool' - app 'VMware Fusion.app' uninstall_preflight do set_ownership "#{staged_path}/VMware Fusion.app" end zap :delete => [ - # note: '~/Library/Application Support/VMware Fusion' is not safe - # to delete. In older versions, VM images were located there. - '~/Library/Caches/com.vmware.fusion', - '~/Library/Logs/VMware', - '~/Library/Logs/VMware Fusion', + # note: '~/Library/Application Support/VMware Fusion' is not safe + # to delete. In older versions, VM images were located there. + '~/Library/Caches/com.vmware.fusion', + '~/Library/Logs/VMware', + '~/Library/Logs/VMware Fusion', ] end diff --git a/Casks/webstorm-eap.rb b/Casks/webstorm-eap.rb index abe8d0f8b..1f7fc95dc 100644 --- a/Casks/webstorm-eap.rb +++ b/Casks/webstorm-eap.rb @@ -11,11 +11,11 @@ cask 'webstorm-eap' do binary 'WebStorm.app/Contents/MacOS/webstorm' zap :delete => [ - '~/.WebStorm12', - '~/Library/Preferences/com.jetbrains.webstorm.plist', - '~/Library/Preferences/WebStorm12', - '~/Library/Application Support/WebStorm12', - '~/Library/Caches/WebStorm12', - '~/Library/Logs/WebStorm12', + '~/.WebStorm12', + '~/Library/Preferences/com.jetbrains.webstorm.plist', + '~/Library/Preferences/WebStorm12', + '~/Library/Application Support/WebStorm12', + '~/Library/Caches/WebStorm12', + '~/Library/Logs/WebStorm12', ] end diff --git a/Casks/weka-dev.rb b/Casks/weka-dev.rb index 9574ed301..e53fb88e9 100644 --- a/Casks/weka-dev.rb +++ b/Casks/weka-dev.rb @@ -3,10 +3,10 @@ cask 'weka-dev' do sha256 'ca8b73d9978b9f9e8a280fef3fe9f1edfd16e2f0aff3b26ad4ace367310f79c9' # sourceforge.net is the official download host per the vendor homepage - url "http://downloads.sourceforge.net/sourceforge/weka/weka-#{version.gsub('.','-')}-oracle-jvm.dmg" + url "http://downloads.sourceforge.net/sourceforge/weka/weka-#{version.gsub('.', '-')}-oracle-jvm.dmg" name 'Weka' homepage 'http://www.cs.waikato.ac.nz/ml/weka/' license :gpl - app "weka-#{version.gsub('.','-')}-oracle-jvm.app" + app "weka-#{version.gsub('.', '-')}-oracle-jvm.app" end diff --git a/Casks/wimoweh-beta.rb b/Casks/wimoweh-beta.rb index 40c262a45..12127fac9 100644 --- a/Casks/wimoweh-beta.rb +++ b/Casks/wimoweh-beta.rb @@ -5,7 +5,7 @@ cask 'wimoweh-beta' do url "https://www.serialangels.co.uk/sa-content/uploads/2015/08/Wimoweh.#{version}_.zip" name 'Wimoweh' homepage 'http://www.serialangels.co.uk/index.php/wimoweh/' - license :unknown + license :unknown # TODO: change license and remove this comment; ':unknown' is a machine-generated placeholder app 'Wimoweh.app' end diff --git a/Casks/xquartz-beta.rb b/Casks/xquartz-beta.rb index bd715a7c1..d4862195b 100644 --- a/Casks/xquartz-beta.rb +++ b/Casks/xquartz-beta.rb @@ -25,18 +25,19 @@ cask 'xquartz-beta' do system 'defaults', 'write', 'org.macosforge.xquartz.X11', 'SUFeedURL', 'http://xquartz.macosforge.org/downloads/sparkle/beta.xml' end - uninstall :quit => 'org.macosforge.xquartz.X11', + uninstall :quit => 'org.macosforge.xquartz.X11', :launchctl => 'org.macosforge.xquartz.*', - :pkgutil => 'org.macosforge.xquartz.pkg', - :delete => '/opt/X11/' + :pkgutil => 'org.macosforge.xquartz.pkg', + :delete => '/opt/X11/' + zap :delete => [ - '~/Library/Caches/org.macosforge.xquartz.X11', - '~/Library/Logs/X11', - '~/Library/Logs/X11.org.macosforge.xquartz.log', - '~/Library/Logs/X11.org.macosforge.xquartz.log.old', - '~/Library/Preferences/org.macosforge.xquartz.X11.plist', - '~/Library/Saved Application State/org.macosforge.xquartz.X11.savedState', - '~/.Xauthority', + '~/Library/Caches/org.macosforge.xquartz.X11', + '~/Library/Logs/X11', + '~/Library/Logs/X11.org.macosforge.xquartz.log', + '~/Library/Logs/X11.org.macosforge.xquartz.log.old', + '~/Library/Preferences/org.macosforge.xquartz.X11.plist', + '~/Library/Saved Application State/org.macosforge.xquartz.X11.savedState', + '~/.Xauthority', ], - :rmdir => '~/.fonts' + :rmdir => '~/.fonts' end