Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
atomantic committed Apr 10, 2017
1 parent b5cfd4e commit 3dbe681
Show file tree
Hide file tree
Showing 3 changed files with 140 additions and 1 deletion.
4 changes: 4 additions & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
**Table of Contents** *generated with [DocToc](https://github.com/thlorenz/doctoc)*

- [Release History](#release-history)
- [v4.4.2](#v442)
- [v4.4.1](#v441)
- [v4.4.0](#v440)
- [v4.3.0](#v430)
Expand All @@ -25,6 +26,9 @@

# Release History

## v4.4.2
* add .iterm2_shell_integration.zsh

## v4.4.1
* re-enable notification center
* fix gitshots optional ability by renaming post-commit -> gitshot-pc
Expand Down
135 changes: 135 additions & 0 deletions homedir/.iterm2_shell_integration.zsh
Original file line number Diff line number Diff line change
@@ -0,0 +1,135 @@
if [[ -o interactive ]]; then
if [ "$TERM" != "screen" -a "$ITERM_SHELL_INTEGRATION_INSTALLED" = "" ]; 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() {
printf "\033]133;C;\007"
}

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() {
}
fi

iterm2_print_state_data() {
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.
if [[ $PS1 == *'$(iterm2_prompt_mark)'* ]]
then
PS1="$PS1%{$(iterm2_prompt_end)%}"
else
PS1="%{$(iterm2_prompt_mark)%}$PS1%{$(iterm2_prompt_end)%}"
fi
}

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
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.
[[ -z "$iterm2_hostname" ]] && iterm2_hostname=`hostname -f`

[[ -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=5;shell=zsh\007"
fi
fi
alias imgcat=~/.iterm2/imgcat; alias it2dl=~/.iterm2/it2dl
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "dotfiles",
"version": "4.4.1",
"version": "4.4.2",
"description": "atomantic dotfiles for osx",
"main": "index.js",
"scripts": {
Expand Down

0 comments on commit 3dbe681

Please sign in to comment.