Merge branch 'refactor-term' of https://github.com/nel/oh-my-zsh into nel-refactor-term
Robby Russell
14 years ago
commit
1a4a16decc
@ -1,11 +1,57 @@
|
||||
function savepath() {
|
||||
pwd > ~/.current_path~
|
||||
}
|
||||
|
||||
function tab() {
|
||||
osascript 2>/dev/null <<EOF
|
||||
savepath
|
||||
osascript >/dev/null <<EOF
|
||||
on do_submenu(app_name, menu_name, menu_item, submenu_item)
|
||||
-- bring the target application to the front
|
||||
tell application app_name
|
||||
activate
|
||||
end tell
|
||||
tell application "System Events"
|
||||
tell process "Terminal" to keystroke "t" using command down
|
||||
end
|
||||
tell application "Terminal"
|
||||
tell process app_name
|
||||
tell menu bar 1
|
||||
tell menu bar item menu_name
|
||||
tell menu menu_name
|
||||
tell menu item menu_item
|
||||
tell menu menu_item
|
||||
click menu item submenu_item
|
||||
end tell
|
||||
end tell
|
||||
end tell
|
||||
end tell
|
||||
end tell
|
||||
end tell
|
||||
end tell
|
||||
end do_submenu
|
||||
|
||||
do_submenu("Terminal", "Shell", "New Tab", 1)
|
||||
EOF
|
||||
}
|
||||
|
||||
function itab() {
|
||||
savepath
|
||||
osascript >/dev/null <<EOF
|
||||
on do_submenu(app_name, menu_name, menu_item)
|
||||
-- bring the target application to the front
|
||||
tell application app_name
|
||||
activate
|
||||
do script with command "cd \"$PWD\"; $*" in window 1
|
||||
end tell
|
||||
tell application "System Events"
|
||||
tell process app_name
|
||||
tell menu bar 1
|
||||
tell menu bar item menu_name
|
||||
tell menu menu_name
|
||||
click menu item menu_item
|
||||
end tell
|
||||
end tell
|
||||
end tell
|
||||
end tell
|
||||
end tell
|
||||
end do_submenu
|
||||
|
||||
do_submenu("iTerm", "Shell", "New Tab")
|
||||
EOF
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,6 +1,63 @@
|
||||
PROMPT='%{$fg[blue]%}%B%20~%b%{$reset_color%}%{$(git_prompt_info)%} $ '
|
||||
PROMPT='%{$fg[blue]%}%n%{$reset_color%} on %{$fg[red]%}%M%{$reset_color%} in %{$fg[blue]%}%~%b%{$reset_color%}$(git_time_since_commit)$(git_prompt_info)
|
||||
$ '
|
||||
|
||||
ZSH_THEME_GIT_PROMPT_PREFIX="(%{$fg[green]%}"
|
||||
ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[white]%}"
|
||||
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%})"
|
||||
ZSH_THEME_GIT_PROMPT_DIRTY="*%{$reset_color%}"
|
||||
|
||||
# Text to display if the branch is dirty
|
||||
ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}*%{$reset_color%}"
|
||||
|
||||
# Text to display if the branch is clean
|
||||
ZSH_THEME_GIT_PROMPT_CLEAN=""
|
||||
|
||||
# Colors vary depending on time lapsed.
|
||||
ZSH_THEME_GIT_TIME_SINCE_COMMIT_SHORT="%{$fg[green]%}"
|
||||
ZSH_THEME_GIT_TIME_SHORT_COMMIT_MEDIUM="%{$fg[yellow]%}"
|
||||
ZSH_THEME_GIT_TIME_SINCE_COMMIT_LONG="%{$fg[red]%}"
|
||||
ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL="%{$fg[cyan]%}"
|
||||
|
||||
# Determine the time since last commit. If branch is clean,
|
||||
# use a neutral color, otherwise colors will vary according to time.
|
||||
function git_time_since_commit() {
|
||||
if git rev-parse --git-dir > /dev/null 2>&1; then
|
||||
# Only proceed if there is actually a commit.
|
||||
if [[ $(git log 2>&1 > /dev/null | grep -c "^fatal: bad default revision") == 0 ]]; then
|
||||
# Get the last commit.
|
||||
last_commit=`git log --pretty=format:'%at' -1 2> /dev/null`
|
||||
now=`date +%s`
|
||||
seconds_since_last_commit=$((now-last_commit))
|
||||
|
||||
# Totals
|
||||
MINUTES=$((seconds_since_last_commit / 60))
|
||||
HOURS=$((seconds_since_last_commit/3600))
|
||||
|
||||
# Sub-hours and sub-minutes
|
||||
DAYS=$((seconds_since_last_commit / 86400))
|
||||
SUB_HOURS=$((HOURS % 24))
|
||||
SUB_MINUTES=$((MINUTES % 60))
|
||||
|
||||
if [[ -n $(git status -s 2> /dev/null) ]]; then
|
||||
if [ "$MINUTES" -gt 30 ]; then
|
||||
COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_LONG"
|
||||
elif [ "$MINUTES" -gt 10 ]; then
|
||||
COLOR="$ZSH_THEME_GIT_TIME_SHORT_COMMIT_MEDIUM"
|
||||
else
|
||||
COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_SHORT"
|
||||
fi
|
||||
else
|
||||
COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL"
|
||||
fi
|
||||
|
||||
if [ "$HOURS" -gt 24 ]; then
|
||||
echo "($COLOR${DAYS}d${SUB_HOURS}h${SUB_MINUTES}m%{$reset_color%}|"
|
||||
elif [ "$MINUTES" -gt 60 ]; then
|
||||
echo "($COLOR${HOURS}h${SUB_MINUTES}m%{$reset_color%}|"
|
||||
else
|
||||
echo "($COLOR${MINUTES}m%{$reset_color%}|"
|
||||
fi
|
||||
else
|
||||
COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL"
|
||||
echo "($COLOR~|"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
@ -0,0 +1,7 @@
|
||||
PROMPT='%F{green}%2c%F{blue} [%f '
|
||||
RPROMPT='$(git_prompt_info) %F{blue}] %F{green}%D{%L:%M} %F{yellow}%D{%p}%f'
|
||||
|
||||
ZSH_THEME_GIT_PROMPT_PREFIX="%F{yellow}"
|
||||
ZSH_THEME_GIT_PROMPT_SUFFIX="%f"
|
||||
ZSH_THEME_GIT_PROMPT_DIRTY=" %F{red}*%f"
|
||||
ZSH_THEME_GIT_PROMPT_CLEAN=""
|
||||
Loading…
Reference in new issue