feat(zsh): install iTerm2 integration during lazy update
Bundle the iTerm2 zsh integration for offline use. Let update.sh repair a missing or empty installation using curl with redirect support, falling back to the bundled copy on offline, missing curl, failed downloads, or empty responses. Stage the result beside the target before moving it into place. Append the readability-checked source line to .zshrc only when missing, including when .zshrc does not exist or lacks a final newline. Keep configure_priv.sh and the installation flow unchanged.
This commit is contained in:
parent
ac5b9450f2
commit
ebffc87b78
178
files/zsh/iterm2_shell_integration.zsh
Normal file
178
files/zsh/iterm2_shell_integration.zsh
Normal file
@ -0,0 +1,178 @@
|
|||||||
|
# This program is free software; you can redistribute it and/or
|
||||||
|
# modify it under the terms of the GNU General Public License
|
||||||
|
# as published by the Free Software Foundation; either version 2
|
||||||
|
# of the License, or (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with this program; if not, write to the Free Software
|
||||||
|
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
||||||
|
if [[ -o interactive ]]; then
|
||||||
|
if [ "${ITERM_ENABLE_SHELL_INTEGRATION_WITH_TMUX-}""$TERM" != "tmux-256color" -a "${ITERM_ENABLE_SHELL_INTEGRATION_WITH_TMUX-}""$TERM" != "screen" -a "${ITERM_SHELL_INTEGRATION_INSTALLED-}" = "" -a "$TERM" != linux -a "$TERM" != dumb ]; then
|
||||||
|
ITERM_SHELL_INTEGRATION_INSTALLED=Yes
|
||||||
|
ITERM2_SHOULD_DECORATE_PROMPT="1"
|
||||||
|
# Indicates start of command output. Runs just before command executes.
|
||||||
|
iterm2_before_cmd_executes() {
|
||||||
|
if [ "$TERM_PROGRAM" = "iTerm.app" ]; then
|
||||||
|
printf "\033]133;C;\r\007"
|
||||||
|
else
|
||||||
|
printf "\033]133;C;\007"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
iterm2_set_user_var() {
|
||||||
|
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
|
||||||
|
# iterm2_set_user_var but not produce any other output.
|
||||||
|
# e.g., iterm2_set_user_var currentDirectory $PWD
|
||||||
|
# Accessible in iTerm2 (in a badge now, elsewhere in the future) as
|
||||||
|
# \(user.currentDirectory).
|
||||||
|
whence -v iterm2_print_user_vars > /dev/null 2>&1
|
||||||
|
if [ $? -ne 0 ]; then
|
||||||
|
iterm2_print_user_vars() {
|
||||||
|
true
|
||||||
|
}
|
||||||
|
fi
|
||||||
|
|
||||||
|
iterm2_print_state_data() {
|
||||||
|
local _iterm2_hostname="${iterm2_hostname-}"
|
||||||
|
if [ -z "${iterm2_hostname:-}" ]; then
|
||||||
|
_iterm2_hostname=$(hostname -f 2>/dev/null)
|
||||||
|
fi
|
||||||
|
printf "\033]1337;RemoteHost=%s@%s\007" "$USER" "${_iterm2_hostname-}"
|
||||||
|
printf "\033]1337;CurrentDir=%s\007" "$PWD"
|
||||||
|
iterm2_print_user_vars
|
||||||
|
}
|
||||||
|
|
||||||
|
# Report return code of command; runs after command finishes but before prompt
|
||||||
|
iterm2_after_cmd_executes() {
|
||||||
|
printf "\033]133;D;%s\007" "$STATUS"
|
||||||
|
iterm2_print_state_data
|
||||||
|
}
|
||||||
|
|
||||||
|
# Mark start of prompt
|
||||||
|
iterm2_prompt_mark() {
|
||||||
|
printf "\033]133;A\007"
|
||||||
|
}
|
||||||
|
|
||||||
|
# Mark end of prompt
|
||||||
|
iterm2_prompt_end() {
|
||||||
|
printf "\033]133;B\007"
|
||||||
|
}
|
||||||
|
|
||||||
|
# There are three possible paths in life.
|
||||||
|
#
|
||||||
|
# 1) A command is entered at the prompt and you press return.
|
||||||
|
# The following steps happen:
|
||||||
|
# * iterm2_preexec is invoked
|
||||||
|
# * PS1 is set to ITERM2_PRECMD_PS1
|
||||||
|
# * ITERM2_SHOULD_DECORATE_PROMPT is set to 1
|
||||||
|
# * The command executes (possibly reading or modifying PS1)
|
||||||
|
# * iterm2_precmd is invoked
|
||||||
|
# * ITERM2_PRECMD_PS1 is set to PS1 (as modified by command execution)
|
||||||
|
# * PS1 gets our escape sequences added to it
|
||||||
|
# * zsh displays your prompt
|
||||||
|
# * You start entering a command
|
||||||
|
#
|
||||||
|
# 2) You press ^C while entering a command at the prompt.
|
||||||
|
# The following steps happen:
|
||||||
|
# * (iterm2_preexec is NOT invoked)
|
||||||
|
# * iterm2_precmd is invoked
|
||||||
|
# * iterm2_before_cmd_executes is called since we detected that iterm2_preexec was not run
|
||||||
|
# * (ITERM2_PRECMD_PS1 and PS1 are not messed with, since PS1 already has our escape
|
||||||
|
# sequences and ITERM2_PRECMD_PS1 already has PS1's original value)
|
||||||
|
# * zsh displays your prompt
|
||||||
|
# * You start entering a command
|
||||||
|
#
|
||||||
|
# 3) A new shell is born.
|
||||||
|
# * PS1 has some initial value, either zsh's default or a value set before this script is sourced.
|
||||||
|
# * iterm2_precmd is invoked
|
||||||
|
# * ITERM2_SHOULD_DECORATE_PROMPT is initialized to 1
|
||||||
|
# * ITERM2_PRECMD_PS1 is set to the initial value of PS1
|
||||||
|
# * PS1 gets our escape sequences added to it
|
||||||
|
# * Your prompt is shown and you may begin entering a command.
|
||||||
|
#
|
||||||
|
# Invariants:
|
||||||
|
# * ITERM2_SHOULD_DECORATE_PROMPT is 1 during and just after command execution, and "" while the prompt is
|
||||||
|
# shown and until you enter a command and press return.
|
||||||
|
# * PS1 does not have our escape sequences during command execution
|
||||||
|
# * After the command executes but before a new one begins, PS1 has escape sequences and
|
||||||
|
# ITERM2_PRECMD_PS1 has PS1's original value.
|
||||||
|
iterm2_decorate_prompt() {
|
||||||
|
# This should be a raw PS1 without iTerm2's stuff. It could be changed during command
|
||||||
|
# execution.
|
||||||
|
ITERM2_PRECMD_PS1="$PS1"
|
||||||
|
ITERM2_SHOULD_DECORATE_PROMPT=""
|
||||||
|
|
||||||
|
# Add our escape sequences just before the prompt is shown.
|
||||||
|
# Use ITERM2_SQUELCH_MARK for people who can't modify PS1 directly, like powerlevel9k users.
|
||||||
|
# This is gross but I had a heck of a time writing a correct if statetment for zsh 5.0.2.
|
||||||
|
local PREFIX=""
|
||||||
|
if [[ $PS1 == *"$(iterm2_prompt_mark)"* ]]; then
|
||||||
|
PREFIX=""
|
||||||
|
elif [[ "${ITERM2_SQUELCH_MARK-}" != "" ]]; then
|
||||||
|
PREFIX=""
|
||||||
|
else
|
||||||
|
PREFIX="%{$(iterm2_prompt_mark)%}"
|
||||||
|
fi
|
||||||
|
PS1="$PREFIX$PS1%{$(iterm2_prompt_end)%}"
|
||||||
|
ITERM2_DECORATED_PS1="$PS1"
|
||||||
|
}
|
||||||
|
|
||||||
|
iterm2_precmd() {
|
||||||
|
local STATUS="$?"
|
||||||
|
if [ -z "${ITERM2_SHOULD_DECORATE_PROMPT-}" ]; then
|
||||||
|
# You pressed ^C while entering a command (iterm2_preexec did not run)
|
||||||
|
iterm2_before_cmd_executes
|
||||||
|
if [ "$PS1" != "${ITERM2_DECORATED_PS1-}" ]; then
|
||||||
|
# PS1 changed, perhaps in another precmd. See issue 9938.
|
||||||
|
ITERM2_SHOULD_DECORATE_PROMPT="1"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
iterm2_after_cmd_executes "$STATUS"
|
||||||
|
|
||||||
|
if [ -n "$ITERM2_SHOULD_DECORATE_PROMPT" ]; then
|
||||||
|
iterm2_decorate_prompt
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# This is not run if you press ^C while entering a command.
|
||||||
|
iterm2_preexec() {
|
||||||
|
# Set PS1 back to its raw value prior to executing the command.
|
||||||
|
PS1="$ITERM2_PRECMD_PS1"
|
||||||
|
ITERM2_SHOULD_DECORATE_PROMPT="1"
|
||||||
|
iterm2_before_cmd_executes
|
||||||
|
}
|
||||||
|
|
||||||
|
# If hostname -f is slow on your system set iterm2_hostname prior to
|
||||||
|
# sourcing this script. We know it is fast on macOS so we don't cache
|
||||||
|
# it. That lets us handle the hostname changing like when you attach
|
||||||
|
# to a VPN.
|
||||||
|
if [ -z "${iterm2_hostname-}" ]; then
|
||||||
|
if [ "$(uname)" != "Darwin" ]; then
|
||||||
|
iterm2_hostname=`hostname -f 2>/dev/null`
|
||||||
|
# Some flavors of BSD (i.e. NetBSD and OpenBSD) don't have the -f option.
|
||||||
|
if [ $? -ne 0 ]; then
|
||||||
|
iterm2_hostname=`hostname`
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
[[ -z ${precmd_functions-} ]] && precmd_functions=()
|
||||||
|
precmd_functions=($precmd_functions iterm2_precmd)
|
||||||
|
|
||||||
|
[[ -z ${preexec_functions-} ]] && preexec_functions=()
|
||||||
|
preexec_functions=($preexec_functions iterm2_preexec)
|
||||||
|
|
||||||
|
iterm2_print_state_data
|
||||||
|
printf "\033]1337;ShellIntegrationVersion=14;shell=zsh\007"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
22
update.sh
22
update.sh
@ -37,6 +37,27 @@ update_authorized_keys() {
|
|||||||
done <<< "$public_keys"
|
done <<< "$public_keys"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
update_iterm2_shell_integration() {
|
||||||
|
local iterm2_script="$HOME/.iterm2_shell_integration.zsh"
|
||||||
|
local bundled_script="$scriptdir/files/zsh/iterm2_shell_integration.zsh"
|
||||||
|
local tmp_script
|
||||||
|
local source_line='[ -r "$HOME/.iterm2_shell_integration.zsh" ] && source "$HOME/.iterm2_shell_integration.zsh"'
|
||||||
|
|
||||||
|
if [ ! -s "$iterm2_script" ]; then
|
||||||
|
tmp_script=$(mktemp "$HOME/.iterm2_shell_integration.zsh.XXXXXX") || return
|
||||||
|
if [ "${offline:-0}" = 1 ] || ! command -v curl >/dev/null 2>&1 ||
|
||||||
|
! curl -fsSL -m 15 "https://iterm2.com/shell_integration/zsh" -o "$tmp_script" || [ ! -s "$tmp_script" ]; then
|
||||||
|
cp "$bundled_script" "$tmp_script" || { rm -f "$tmp_script"; return 1; }
|
||||||
|
fi
|
||||||
|
mv -f "$tmp_script" "$iterm2_script" || { rm -f "$tmp_script"; return 1; }
|
||||||
|
fi
|
||||||
|
|
||||||
|
touch "$HOME/.zshrc" || return
|
||||||
|
if ! grep -Fxq "$source_line" "$HOME/.zshrc"; then
|
||||||
|
printf '\n%s\n' "$source_line" >>"$HOME/.zshrc"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
# ============================================================
|
# ============================================================
|
||||||
|
|
||||||
update_file $scriptdir/files/.nanorc ~/.nanorc
|
update_file $scriptdir/files/.nanorc ~/.nanorc
|
||||||
@ -52,6 +73,7 @@ update_file $scriptdir/files/zsh/80-proxy.zsh ~/.oh-my-zsh/custom/80-p
|
|||||||
update_file $scriptdir/files/zsh/90-other.zsh ~/.oh-my-zsh/custom/90-other.zsh
|
update_file $scriptdir/files/zsh/90-other.zsh ~/.oh-my-zsh/custom/90-other.zsh
|
||||||
update_file $scriptdir/files/zsh/ys-simple.zsh-theme ~/.oh-my-zsh/custom/themes/ys-simple.zsh-theme
|
update_file $scriptdir/files/zsh/ys-simple.zsh-theme ~/.oh-my-zsh/custom/themes/ys-simple.zsh-theme
|
||||||
update_authorized_keys
|
update_authorized_keys
|
||||||
|
update_iterm2_shell_integration
|
||||||
|
|
||||||
# sudo_id=$(sudo id -u 2>/dev/null)
|
# sudo_id=$(sudo id -u 2>/dev/null)
|
||||||
# if [ $? -eq 0 ] && [ "$sudo_id" -eq 0 ]; then
|
# if [ $? -eq 0 ] && [ "$sudo_id" -eq 0 ]; then
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user