refactor to prefer brew cask on macOS, stop explicit checks for app paths and let brew do it

gimme

@@ -24,7 +24,15 @@ pkgtool() {
 }
 
 gimme_pkg() {
-	pkgtool install "$@"
+	if [[ "$OS" = "Darwin" ]]; then
+		if pkgtool cask info "$@"; then
+			pkgtool cask install "$@"
+		else
+			pkgtool install "$@"
+		fi
+	else
+		pkgtool install "$@"
+	fi
 }
 
 export -f has pkgtool gimme_pkg

gimmes/android-studio

@@ -4,7 +4,7 @@ set -o errexit -o pipefail
 gimme java
 
 if [[ "$OS" = "Darwin" ]]; then
-	[[ -d "$HOME/Applications/Android Studio.app/" ]]  ||  brew cask install android-studio
+	brew cask install android-studio
 else
 	if ! has android-studio; then
 		URL='https://dl.google.com/dl/android/studio/ide-zips/2.0.0.20/android-studio-ide-143.2739321-linux.zip'

gimmes/atom

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -o errexit -o pipefail
 if [[ "$OS" = "Darwin" ]]; then
-	[[ -d "$HOME/Applications/Atom.app/" ]]  ||  brew cask install atom
+	brew cask install atom
 	defaults write com.github.atom ApplePressAndHoldEnabled -bool false
 else
 	if ! has atom; then

gimmes/charles

@@ -1,9 +1,7 @@
 #!/bin/bash
 set -o errexit -o pipefail
 if [[ "$OS" = "Darwin" ]]; then
-	if ! [[ -d "$HOME/Applications/Charles.app/" ]]; then
-		brew cask install charles
-	fi
+	brew cask install charles
 else
 	echo "TODO: add Charles for Linux!"
 fi

gimmes/eclipse-jee

@@ -4,7 +4,7 @@ set -o errexit -o pipefail
 gimme java
 
 if [[ "$OS" = "Darwin" ]]; then
-	[[ -d "$HOME/Applications/Eclipse.app/" ]]  ||  brew cask install eclipse-jee
+	brew cask install eclipse-jee
 else
 	if ! has eclipse; then
 		URL='http://www.eclipse.org/downloads/download.php?file=/technology/epp/downloads/release/mars/R/eclipse-jee-mars-R-linux-gtk-x86_64.tar.gz&r=1'

gimmes/firefox

@@ -1,7 +0,0 @@
-#!/bin/bash
-set -o errexit -o pipefail
-if [[ "$OS" = "Darwin" ]]; then
-	[[ -d "$HOME/Applications/Firefox.app/" ]]  ||  brew cask install firefox
-else
-	has firefox  ||  gimme_pkg firefox
-fi

gimmes/google-chrome

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -o errexit -o pipefail
 if [[ "$OS" = "Darwin" ]]; then
-	[[ -d "$HOME/Applications/Google Chrome.app/" ]]  ||  brew cask install google-chrome
+	brew cask install google-chrome
 else
 	if ! has google-chrome && ! has chromium-browser; then
 		gimme_pkg chromium-browser

gimmes/java

@@ -2,7 +2,7 @@
 set -o errexit -o pipefail
 
 if [[ "$OS" = "Darwin" ]]; then
-	[ -d "/Library/PreferencePanes/JavaControlPanel.prefPane" ]  ||  brew cask install java
+	brew cask install java
 else
 	has java  ||  gimme_pkg openjdk-8-jdk
 fi

gimmes/my/mergetool

@@ -1,7 +1,8 @@
 #!/bin/bash
 set -o errexit -o pipefail
+
 if [[ "$OS" = "Darwin" ]]; then
-	[[ -d "$HOME/Applications/SourceTree.app" ]]  ||  brew cask install sourcetree
+	gimme sourcetree
 else
 	gimme meld
 fi

gimmes/sourcetree

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -o errexit -o pipefail
 if [[ "$OS" = "Darwin" ]]; then
-	[[ -d "$HOME/Applications/SourceTree.app/" ]]  ||  brew cask install sourcetree
+	brew cask install sourcetree
 else
 	echo "WARN: no equivalent for when OS=$OS"
 fi

gimmes/vscode

@@ -1,9 +1,9 @@
 #!/bin/bash
 set -o errexit -o pipefail
-if ! has code; then
-	if [[ "$OS" = "Darwin" ]]; then
-		brew cask install visual-studio-code
-	else
+if [[ "$OS" = "Darwin" ]]; then
+	brew cask install visual-studio-code
+else
+	if ! has code; then
 		URL="https://go.microsoft.com/fwlink/?LinkID=760868"
 		TMP_FILE="/tmp/gimme.vscode-amd64.1.0.0.deb"
 		curl -fSLC- "$URL" -o "$TMP_FILE"