iterm2: Try to load user-local shell integration first

[ax-zsh.git] / plugins / iterm2 / iterm2.zshrc

diff --git a/plugins/iterm2/iterm2.zshrc b/plugins/iterm2/iterm2.zshrc
index 6c022729c90dba28f52f526d11425da8afa1cfbd..dc24d79ba63cbb1a44f92e6bbd6ee92a5dcb0906 100644 (file)
--- a/plugins/iterm2/iterm2.zshrc
+++ b/plugins/iterm2/iterm2.zshrc
@@ -1,9 +1,20 @@
 # AX-ZSH: Alex' Modular ZSH Configuration
 # iterm2.zshrc: iTerm2 Shell Integration
 
-axzsh_is_dumb_terminal && return
-[[ "$TERM" != "screen" && "$TERM" != "screen-256color" ]] || return
+[[ -z "$AXZSH_PLUGIN_CHECK" ]] || return 92
 
+# Check prerequisites ...
+axzsh_is_dumb_terminal && return 91
+[[ -o interactive ]] || return 91
+[[ -z "$ITERM_SHELL_INTEGRATION_INSTALLED" ]] || return 91
+[[ "$TERM" != "screen" && "$TERM" != "screen-256color" ]] || return 91
+
+# Try to source user-local shell integration installed by iTerm2 itself,
+# and only fall back to the implementation here when not found.
+[[ -e "$HOME/.iterm2_shell_integration.zsh" ]] && source "$HOME/.iterm2_shell_integration.zsh"
+[[ -z "$ITERM_SHELL_INTEGRATION_INSTALLED" ]] || return 0
+
+ITERM_SHELL_INTEGRATION_INSTALLED="Yes"
 ITERM2_SHOULD_DECORATE_PROMPT="1"
 
 # Indicates start of command output. Runs just before command executes.
@@ -12,7 +23,7 @@ iterm2_before_cmd_executes() {
 }
 
 iterm2_set_user_var() {
-       printf "\033]1337;SetUserVar=%s=%s\007" "$1" "$(printf "%s" "$2" | base64)"
+       printf "\033]1337;SetUserVar=%s=%s\007" "$1" $(printf "%s" "$2" | base64 | tr -d '\n')
 }
 
 # Users can write their own version of this method. It should call
@@ -40,7 +51,7 @@ iterm2_after_cmd_executes() {
 }
 
 # Mark start of prompt
-iterm2_prompt_start() {
+iterm2_prompt_mark() {
        printf "\033]133;A\007"
 }
 
@@ -94,7 +105,12 @@ iterm2_decorate_prompt() {
        ITERM2_SHOULD_DECORATE_PROMPT=""
 
        # Add our escape sequences just before the prompt is shown.
-       PS1="%{$(iterm2_prompt_start)%}$PS1%{$(iterm2_prompt_end)%}"
+       if [[ $PS1 == *'$(iterm2_prompt_mark)'* ]]
+       then
+               PS1="$PS1%{$(iterm2_prompt_end)%}"
+       else
+               PS1="%{$(iterm2_prompt_mark)%}$PS1%{$(iterm2_prompt_end)%}"
+       fi
 }
 
 iterm2_precmd() {
@@ -126,4 +142,10 @@ precmd_functions+=(iterm2_precmd)
 preexec_functions+=(iterm2_preexec)
 
 iterm2_print_state_data
-printf "\033]1337;ShellIntegrationVersion=2;shell=zsh\007"
+printf "\033]1337;ShellIntegrationVersion=5;shell=zsh\007"
+
+# Setup iTerm2 command aliases
+for cmd (~/.iterm2/*(N)); do
+       [[ -x "$cmd" ]] && alias "$(basename "$cmd")=$cmd"
+done
+unset cmd