init

CompareTools.plist

@@ -5,15 +5,15 @@
 <array>
     <dict>
         <key>ApplicationIdentifier</key>
-        <string>com.jetbrains.idea</string>
+        <string>com.jetbrains.intellij</string>
         <key>ApplicationName</key>
-        <string>idea</string>
+        <string>IntelliJ IDEA 15</string>
         <key>DisplayName</key>
         <string>IntelliJ IDEA</string>
         <key>LaunchScript</key>
         <string>idea-tower.sh</string>
         <key>Identifier</key>
-        <string>idea</string>
+        <string>com.jetbrains.intellij</string>
         <key>SupportsMergeTool</key>
         <true/>
         <key>SupportsDiffChangeset</key>

idea-tower.sh

@@ -1,11 +1,5 @@
 #! /usr/bin/env bash
 
-# Shell script shim to let Tower.app (http://git-tower.com) to integrate with
-# the free, open-source, kdiff3 application.
-#
-# We pipe stderr to /dev/null as kdiff3 is really noisy even when there's no
-# problem and it screws up tower thinking there was a problem with the merge
-
 # Tower.app gives us these parameters:
 LOCAL="$1"
 REMOTE="$2"
@@ -25,13 +19,9 @@ fi
 MERGING="$4"
 BACKUP="/tmp/$(date +"%Y%d%m%H%M%S")"
 
+APPLICATION_PATH="/Applications/IntelliJ IDEA 15.app"
 CMD="/Applications/IntelliJ IDEA 15.app/Contents/MacOS/idea"
 
-if [ ! -x "$CMD" ]; then
-	echo "kdiff3 application could not be found!" >&2
-	exit 128
-fi
-
 if [ -n "$MERGING" ]; then
   BASE="$3"
 	MERGE="$4"

install.sh

@@ -1,3 +1,4 @@
-mkdir ~/Library/Application\ Support/com.fournova.Tower2/CompareTools
+mkdir -p ~/Library/Application\ Support/com.fournova.Tower2/CompareTools
 cp CompareTools.plist ~/Library/Application\ Support/com.fournova.Tower2/CompareTools
 cp idea-tower.sh ~/Library/Application\ Support/com.fournova.Tower2/CompareTools
+chmod +x ~/Library/Application\ Support/com.fournova.Tower2/CompareTools/idea-tower.sh