From ff6d9323fd104ed90664f9127c87b3c03f91ff9f Mon Sep 17 00:00:00 2001
From: Jonathan Cremin <jonathan@crem.in>
Date: Thu, 23 Jul 2015 13:10:40 +0100
Subject: [PATCH] Add support for launching iTerm 2.9+

The AppleScript bridge changed at some point since 2.1. While marked as
beta, the 2.9 series is the author's recommended version to use.

The two bridges are incompatible, requiring another function and version
checks.
---
 resources/terminal | 61 +++++++++++++++++++++++++++++++++-------------
 1 file changed, 44 insertions(+), 17 deletions(-)

diff --git a/resources/terminal b/resources/terminal
index af5af69872..ade48d0f32 100755
--- a/resources/terminal
+++ b/resources/terminal
@@ -16,22 +16,49 @@ EOF`
 function open_iterm () {
   osascript > /dev/null <<EOF
   tell application "iTerm"
-    activate
-    try
-      tell the first terminal
-        launch session "Default Session"
-        tell the last session
-          write text "bash -c \"$CMD\""
-        end tell
-      end tell
-    on error
-      tell (make new terminal)
-        launch session "Default Session"
-        tell the last session
-          write text "bash -c \"$CMD\""
-        end tell
-      end tell
-    end try
+    if version < 2.9 then
+      activate
+      try
+      	tell current window
+          create tab with default profile
+    	    tell the current session of current window
+            write text "bash -c \"$CMD\""
+          end tell
+      	end tell
+      on error
+    	  try
+          tell the first terminal
+            launch session "Default Session"
+            tell the last session
+              write text "bash -c \"$CMD\""
+            end tell
+          end tell
+        on error
+          tell (make new terminal)
+            launch session "Default Session"
+            tell the last session
+              write text "bash -c \"$CMD\""
+            end tell
+          end tell
+        end try
+      end try
+    end if
+  end tell
+EOF
+}
+
+function open_iterm2point9 () {
+  osascript > /dev/null <<EOF
+  tell application "iTerm"
+  	if version ≥ 2.9 then
+      activate
+  		tell current window
+  			create tab with default profile
+  			tell first session of current tab
+  				write text "bash -c \"$CMD\""
+  			end tell
+  		end tell
+  	end if
   end tell
 EOF
 }
@@ -48,7 +75,7 @@ EOF
 }
 
 if [ "$ITERM_EXISTS" == "true" ]; then
-  open_iterm "$@" || open_terminal "$@"
+  open_iterm2point9 "$@" || open_iterm "$@" || open_terminal "$@"
 else
   open_terminal "$@"
 fi