mirror of https://github.com/docker/docs.git
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.
This commit is contained in:
parent
bdf9b95906
commit
ff6d9323fd
|
|
@ -16,7 +16,16 @@ EOF`
|
||||||
function open_iterm () {
|
function open_iterm () {
|
||||||
osascript > /dev/null <<EOF
|
osascript > /dev/null <<EOF
|
||||||
tell application "iTerm"
|
tell application "iTerm"
|
||||||
|
if version < 2.9 then
|
||||||
activate
|
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
|
try
|
||||||
tell the first terminal
|
tell the first terminal
|
||||||
launch session "Default Session"
|
launch session "Default Session"
|
||||||
|
|
@ -32,6 +41,24 @@ function open_iterm () {
|
||||||
end tell
|
end tell
|
||||||
end tell
|
end tell
|
||||||
end try
|
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
|
end tell
|
||||||
EOF
|
EOF
|
||||||
}
|
}
|
||||||
|
|
@ -48,7 +75,7 @@ EOF
|
||||||
}
|
}
|
||||||
|
|
||||||
if [ "$ITERM_EXISTS" == "true" ]; then
|
if [ "$ITERM_EXISTS" == "true" ]; then
|
||||||
open_iterm "$@" || open_terminal "$@"
|
open_iterm2point9 "$@" || open_iterm "$@" || open_terminal "$@"
|
||||||
else
|
else
|
||||||
open_terminal "$@"
|
open_terminal "$@"
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue