mirror of
https://github.com/fergalmoran/settings-webstorm.git
synced 2025-12-22 09:47:41 +00:00
Fixed bash prompt
This commit is contained in:
Fergal Moran
330
bash_prompt
330
bash_prompt
@@ -1,91 +1,269 @@
|
||||
# @gf3’s Sexy Bash Prompt, inspired by “Extravagant Zsh Prompt”
|
||||
# Shamelessly copied from https://github.com/gf3/dotfiles
|
||||
|
||||
default_username='fergal'
|
||||
|
||||
if [[ $COLORTERM = gnome-* && $TERM = xterm ]] && infocmp gnome-256color >/dev/null 2>&1; then
|
||||
export TERM=gnome-256color
|
||||
elif infocmp xterm-256color >/dev/null 2>&1; then
|
||||
export TERM=xterm-256color
|
||||
fi
|
||||
#!/usr/bin/env bash
|
||||
# Sexy bash prompt by twolfson
|
||||
# https://github.com/twolfson/sexy-bash-prompt
|
||||
# Forked from gf3, https://gist.github.com/gf3/306785
|
||||
|
||||
# If we are on a colored terminal
|
||||
if tput setaf 1 &> /dev/null; then
|
||||
tput sgr0
|
||||
if [[ $(tput colors) -ge 256 ]] 2>/dev/null; then
|
||||
MAGENTA=$(tput setaf 9)
|
||||
ORANGE=$(tput setaf 172)
|
||||
GREEN=$(tput setaf 190)
|
||||
PURPLE=$(tput setaf 141)
|
||||
WHITE=$(tput setaf 256)
|
||||
else
|
||||
MAGENTA=$(tput setaf 5)
|
||||
ORANGE=$(tput setaf 4)
|
||||
GREEN=$(tput setaf 2)
|
||||
PURPLE=$(tput setaf 1)
|
||||
WHITE=$(tput setaf 7)
|
||||
fi
|
||||
BOLD=$(tput bold)
|
||||
RESET=$(tput sgr0)
|
||||
# Reset the shell from our `if` check
|
||||
tput sgr0 &> /dev/null
|
||||
|
||||
# If you would like to customize your colors, use
|
||||
# # Attribution: http://linuxtidbits.wordpress.com/2008/08/11/output-color-on-bash-scripts/
|
||||
# for i in $(seq 0 $(tput colors)); do
|
||||
# echo " $(tput setaf $i)Text$(tput sgr0) $(tput bold)$(tput setaf $i)Text$(tput sgr0) $(tput sgr 0 1)$(tput setaf $i)Text$(tput sgr0) \$(tput setaf $i)"
|
||||
# done
|
||||
|
||||
# Save common color actions
|
||||
sexy_bash_prompt_bold="$(tput bold)"
|
||||
sexy_bash_prompt_reset="$(tput sgr0)"
|
||||
|
||||
# If the terminal supports at least 256 colors, write out our 256 color based set
|
||||
if [[ "$(tput colors)" -ge 256 ]] &> /dev/null; then
|
||||
sexy_bash_prompt_user_color="$sexy_bash_prompt_bold$(tput setaf 27)" # BOLD BLUE
|
||||
sexy_bash_prompt_preposition_color="$sexy_bash_prompt_bold$(tput setaf 7)" # BOLD WHITE
|
||||
sexy_bash_prompt_device_color="$sexy_bash_prompt_bold$(tput setaf 39)" # BOLD CYAN
|
||||
sexy_bash_prompt_dir_color="$sexy_bash_prompt_bold$(tput setaf 76)" # BOLD GREEN
|
||||
sexy_bash_prompt_git_status_color="$sexy_bash_prompt_bold$(tput setaf 154)" # BOLD YELLOW
|
||||
sexy_bash_prompt_git_progress_color="$sexy_bash_prompt_bold$(tput setaf 9)" # BOLD RED
|
||||
else
|
||||
# Otherwise, use colors from our set of 8
|
||||
sexy_bash_prompt_user_color="$sexy_bash_prompt_bold$(tput setaf 4)" # BOLD BLUE
|
||||
sexy_bash_prompt_preposition_color="$sexy_bash_prompt_bold$(tput setaf 7)" # BOLD WHITE
|
||||
sexy_bash_prompt_device_color="$sexy_bash_prompt_bold$(tput setaf 6)" # BOLD CYAN
|
||||
sexy_bash_prompt_dir_color="$sexy_bash_prompt_bold$(tput setaf 2)" # BOLD GREEN
|
||||
sexy_bash_prompt_git_status_color="$sexy_bash_prompt_bold$(tput setaf 3)" # BOLD YELLOW
|
||||
sexy_bash_prompt_git_progress_color="$sexy_bash_prompt_bold$(tput setaf 1)" # BOLD RED
|
||||
fi
|
||||
|
||||
sexy_bash_prompt_symbol_color="$sexy_bash_prompt_bold" # BOLD
|
||||
|
||||
else
|
||||
MAGENTA="\033[1;31m"
|
||||
ORANGE="\033[1;33m"
|
||||
GREEN="\033[1;32m"
|
||||
PURPLE="\033[1;35m"
|
||||
WHITE="\033[1;37m"
|
||||
BOLD=""
|
||||
RESET="\033[m"
|
||||
# Otherwise, use ANSI escape sequences for coloring
|
||||
# If you would like to customize your colors, use
|
||||
# DEV: 30-39 lines up 0-9 from `tput`
|
||||
# for i in $(seq 0 109); do
|
||||
# echo -n -e "\033[1;${i}mText$(tput sgr0) "
|
||||
# echo "\033[1;${i}m"
|
||||
# done
|
||||
|
||||
sexy_bash_prompt_reset="\033[m"
|
||||
sexy_bash_prompt_user_color="\033[1;34m" # BLUE
|
||||
sexy_bash_prompt_preposition_color="\033[1;37m" # WHITE
|
||||
sexy_bash_prompt_device_color="\033[1;36m" # CYAN
|
||||
sexy_bash_prompt_dir_color="\033[1;32m" # GREEN
|
||||
sexy_bash_prompt_git_status_color="\033[1;33m" # YELLOW
|
||||
sexy_bash_prompt_git_progress_color="\033[1;31m" # RED
|
||||
sexy_bash_prompt_symbol_color="" # NORMAL
|
||||
fi
|
||||
|
||||
# Define the default prompt terminator character '$'
|
||||
if [[ "$UID" == 0 ]]; then
|
||||
sexy_bash_prompt_symbol="#"
|
||||
else
|
||||
sexy_bash_prompt_symbol="\$"
|
||||
fi
|
||||
|
||||
function git_info() {
|
||||
# check if we're in a git repo
|
||||
git rev-parse --is-inside-work-tree &>/dev/null || return
|
||||
# Apply any color overrides that have been set in the environment
|
||||
if [[ -n "$PROMPT_USER_COLOR" ]]; then sexy_bash_prompt_user_color="$PROMPT_USER_COLOR"; fi
|
||||
if [[ -n "$PROMPT_PREPOSITION_COLOR" ]]; then sexy_bash_prompt_preposition_color="$PROMPT_PREPOSITION_COLOR"; fi
|
||||
if [[ -n "$PROMPT_DEVICE_COLOR" ]]; then sexy_bash_prompt_device_color="$PROMPT_DEVICE_COLOR"; fi
|
||||
if [[ -n "$PROMPT_DIR_COLOR" ]]; then sexy_bash_prompt_dir_color="$PROMPT_DIR_COLOR"; fi
|
||||
if [[ -n "$PROMPT_GIT_STATUS_COLOR" ]]; then sexy_bash_prompt_git_status_color="$PROMPT_GIT_STATUS_COLOR"; fi
|
||||
if [[ -n "$PROMPT_GIT_PROGRESS_COLOR" ]]; then sexy_bash_prompt_git_progress_color="$PROMPT_GIT_PROGRESS_COLOR"; fi
|
||||
if [[ -n "$PROMPT_SYMBOL" ]]; then sexy_bash_prompt_symbol="$PROMPT_SYMBOL"; fi
|
||||
if [[ -n "$PROMPT_SYMBOL_COLOR" ]]; then sexy_bash_prompt_symbol_color="$PROMPT_SYMBOL_COLOR"; fi
|
||||
|
||||
# quickest check for what branch we're on
|
||||
branch=$(git symbolic-ref -q HEAD | sed -e 's|^refs/heads/||')
|
||||
# Set up symbols
|
||||
sexy_bash_prompt_synced_symbol=""
|
||||
sexy_bash_prompt_dirty_synced_symbol="*"
|
||||
sexy_bash_prompt_unpushed_symbol="△"
|
||||
sexy_bash_prompt_dirty_unpushed_symbol="▲"
|
||||
sexy_bash_prompt_unpulled_symbol="▽"
|
||||
sexy_bash_prompt_dirty_unpulled_symbol="▼"
|
||||
sexy_bash_prompt_unpushed_unpulled_symbol="⬡"
|
||||
sexy_bash_prompt_dirty_unpushed_unpulled_symbol="⬢"
|
||||
|
||||
# check if it's dirty (via github.com/sindresorhus/pure)
|
||||
dirty=$(git diff --quiet --ignore-submodules HEAD &>/dev/null; [ $? -eq 1 ]&& echo -e "*")
|
||||
# Apply symbol overrides that have been set in the environment
|
||||
# DEV: Working unicode symbols can be determined via the following gist
|
||||
# **WARNING: The following gist has 64k lines and may freeze your browser**
|
||||
# https://gist.github.com/twolfson/9cc7968eb6ee8b9ad877
|
||||
if [[ -n "$PROMPT_SYNCED_SYMBOL" ]]; then sexy_bash_prompt_synced_symbol="$PROMPT_SYNCED_SYMBOL"; fi
|
||||
if [[ -n "$PROMPT_DIRTY_SYNCED_SYMBOL" ]]; then sexy_bash_prompt_dirty_synced_symbol="$PROMPT_DIRTY_SYNCED_SYMBOL"; fi
|
||||
if [[ -n "$PROMPT_UNPUSHED_SYMBOL" ]]; then sexy_bash_prompt_unpushed_symbol="$PROMPT_UNPUSHED_SYMBOL"; fi
|
||||
if [[ -n "$PROMPT_DIRTY_UNPUSHED_SYMBOL" ]]; then sexy_bash_prompt_dirty_unpushed_symbol="$PROMPT_DIRTY_UNPUSHED_SYMBOL"; fi
|
||||
if [[ -n "$PROMPT_UNPULLED_SYMBOL" ]]; then sexy_bash_prompt_unpulled_symbol="$PROMPT_UNPULLED_SYMBOL"; fi
|
||||
if [[ -n "$PROMPT_DIRTY_UNPULLED_SYMBOL" ]]; then sexy_bash_prompt_dirty_unpulled_symbol="$PROMPT_DIRTY_UNPULLED_SYMBOL"; fi
|
||||
if [[ -n "$PROMPT_UNPUSHED_UNPULLED_SYMBOL" ]]; then sexy_bash_prompt_unpushed_unpulled_symbol="$PROMPT_UNPUSHED_UNPULLED_SYMBOL"; fi
|
||||
if [[ -n "$PROMPT_DIRTY_UNPUSHED_UNPULLED_SYMBOL" ]]; then sexy_bash_prompt_dirty_unpushed_unpulled_symbol="$PROMPT_DIRTY_UNPUSHED_UNPULLED_SYMBOL"; fi
|
||||
|
||||
echo $WHITE" on "$PURPLE$branch$dirty
|
||||
function sexy_bash_prompt_get_git_branch() {
|
||||
# On branches, this will return the branch name
|
||||
# On non-branches, (no branch)
|
||||
ref="$(git symbolic-ref HEAD 2> /dev/null | sed -e 's/refs\/heads\///')"
|
||||
if [[ "$ref" != "" ]]; then
|
||||
echo "$ref"
|
||||
else
|
||||
echo "(no branch)"
|
||||
fi
|
||||
}
|
||||
|
||||
# Only show username/host if not default
|
||||
function usernamehost() {
|
||||
if [ $USER != $default_username ]; then echo "${MAGENTA}$USER ${WHITE}at ${ORANGE}$HOSTNAME $WHITEin "; fi
|
||||
}
|
||||
function sexy_bash_prompt_get_git_progress() {
|
||||
# Detect in-progress actions (e.g. merge, rebase)
|
||||
# https://github.com/git/git/blob/v1.9-rc2/wt-status.c#L1199-L1241
|
||||
git_dir="$(git rev-parse --git-dir)"
|
||||
|
||||
# iTerm Tab and Title Customization and prompt customization
|
||||
# http://sage.ucsc.edu/xtal/iterm_tab_customization.html
|
||||
|
||||
# Put the string " [bash] hostname::/full/directory/path"
|
||||
# in the title bar using the command sequence
|
||||
# \[\e]2;[bash] \h::\]$PWD\[\a\]
|
||||
|
||||
# Put the penultimate and current directory
|
||||
# in the iterm tab
|
||||
# \[\e]1;\]$(basename $(dirname $PWD))/\W\[\a\]
|
||||
|
||||
#PS1="\[\e]2;$PWD\[\a\]\[\e]1;\]$(basename "$(dirname "$PWD")")/\W\[\a\]${BOLD}\$(usernamehost)\[$GREEN\]\w\$(git_info)\[$WHITE\]\n\$ \[$RESET\]"
|
||||
#
|
||||
#
|
||||
# Show Git Branch and Status
|
||||
force_git_branch_prompt=yes
|
||||
export git_status=
|
||||
export git_branch=
|
||||
|
||||
PROMPT_COMMAND="git_ps1;$PROMPT_COMMAND"
|
||||
|
||||
git_ps1(){
|
||||
git_branch=$((git branch) 2>/dev/null|grep \*|sed 's/^* //g')
|
||||
local clear=$((git status -s) 2>/dev/null)
|
||||
if [ -n "$clear" ];then
|
||||
git_status=×
|
||||
# git merge
|
||||
if [[ -f "$git_dir/MERGE_HEAD" ]]; then
|
||||
echo " [merge]"
|
||||
elif [[ -d "$git_dir/rebase-apply" ]]; then
|
||||
# git am
|
||||
if [[ -f "$git_dir/rebase-apply/applying" ]]; then
|
||||
echo " [am]"
|
||||
# git rebase
|
||||
else
|
||||
git_status=
|
||||
echo " [rebase]"
|
||||
fi
|
||||
elif [[ -d "$git_dir/rebase-merge" ]]; then
|
||||
# git rebase --interactive/--merge
|
||||
echo " [rebase]"
|
||||
elif [[ -f "$git_dir/CHERRY_PICK_HEAD" ]]; then
|
||||
# git cherry-pick
|
||||
echo " [cherry-pick]"
|
||||
fi
|
||||
if [[ -f "$git_dir/BISECT_LOG" ]]; then
|
||||
# git bisect
|
||||
echo " [bisect]"
|
||||
fi
|
||||
if [[ -f "$git_dir/REVERT_HEAD" ]]; then
|
||||
# git revert --no-commit
|
||||
echo " [revert]"
|
||||
fi
|
||||
}
|
||||
if [ ! -z "${force_git_branch_prompt}" ];then
|
||||
PS1='\[\033[01;32m\]\u\[\033[00m\]:\[\033[01;34m\]\W\[\033[00m\]$(if [ -n "$git_branch" ] && [ ! -n "$git_status" ]; then echo "[\[\033[01;33m\]";elif [ -n "$git_branch" ];then echo "[\[\033[01;31m\]";else echo "\[\033[01;31m\]";fi)$(echo $git_branch$git_status)$(if [ -n "$git_branch" ] ; then echo "\[\033[00m\]]";fi)\[\033[00m\]\$ '
|
||||
fi
|
||||
unset force_git_branch_prompt
|
||||
|
||||
sexy_bash_prompt_is_branch1_behind_branch2 () {
|
||||
# $ git log origin/master..master -1
|
||||
# commit 4a633f715caf26f6e9495198f89bba20f3402a32
|
||||
# Author: Todd Wolfson <todd@twolfson.com>
|
||||
# Date: Sun Jul 7 22:12:17 2013 -0700
|
||||
#
|
||||
# Unsynced commit
|
||||
|
||||
# Find the first log (if any) that is in branch1 but not branch2
|
||||
first_log="$(git log $1..$2 -1 2> /dev/null)"
|
||||
|
||||
# Exit with 0 if there is a first log, 1 if there is not
|
||||
[[ -n "$first_log" ]]
|
||||
}
|
||||
|
||||
sexy_bash_prompt_branch_exists () {
|
||||
# List remote branches | # Find our branch and exit with 0 or 1 if found/not found
|
||||
git branch --remote 2> /dev/null | grep --quiet "$1"
|
||||
}
|
||||
|
||||
sexy_bash_prompt_parse_git_ahead () {
|
||||
# Grab the local and remote branch
|
||||
branch="$(sexy_bash_prompt_get_git_branch)"
|
||||
remote_branch="origin/$branch"
|
||||
|
||||
# $ git log origin/master..master
|
||||
# commit 4a633f715caf26f6e9495198f89bba20f3402a32
|
||||
# Author: Todd Wolfson <todd@twolfson.com>
|
||||
# Date: Sun Jul 7 22:12:17 2013 -0700
|
||||
#
|
||||
# Unsynced commit
|
||||
|
||||
# If the remote branch is behind the local branch
|
||||
# or it has not been merged into origin (remote branch doesn't exist)
|
||||
if (sexy_bash_prompt_is_branch1_behind_branch2 "$remote_branch" "$branch" ||
|
||||
! sexy_bash_prompt_branch_exists "$remote_branch"); then
|
||||
# echo our character
|
||||
echo 1
|
||||
fi
|
||||
}
|
||||
|
||||
sexy_bash_prompt_parse_git_behind () {
|
||||
# Grab the branch
|
||||
branch="$(sexy_bash_prompt_get_git_branch)"
|
||||
remote_branch="origin/$branch"
|
||||
|
||||
# $ git log master..origin/master
|
||||
# commit 4a633f715caf26f6e9495198f89bba20f3402a32
|
||||
# Author: Todd Wolfson <todd@twolfson.com>
|
||||
# Date: Sun Jul 7 22:12:17 2013 -0700
|
||||
#
|
||||
# Unsynced commit
|
||||
|
||||
# If the local branch is behind the remote branch
|
||||
if sexy_bash_prompt_is_branch1_behind_branch2 "$branch" "$remote_branch"; then
|
||||
# echo our character
|
||||
echo 1
|
||||
fi
|
||||
}
|
||||
|
||||
function sexy_bash_prompt_parse_git_dirty() {
|
||||
# If the git status has *any* changes (e.g. dirty), echo our character
|
||||
if [[ -n "$(git status --porcelain 2> /dev/null)" ]]; then
|
||||
echo 1
|
||||
fi
|
||||
}
|
||||
|
||||
function sexy_bash_prompt_is_on_git() {
|
||||
git rev-parse 2> /dev/null
|
||||
}
|
||||
|
||||
function sexy_bash_prompt_get_git_status() {
|
||||
# Grab the git dirty and git behind
|
||||
dirty_branch="$(sexy_bash_prompt_parse_git_dirty)"
|
||||
branch_ahead="$(sexy_bash_prompt_parse_git_ahead)"
|
||||
branch_behind="$(sexy_bash_prompt_parse_git_behind)"
|
||||
|
||||
# Iterate through all the cases and if it matches, then echo
|
||||
if [[ "$dirty_branch" == 1 && "$branch_ahead" == 1 && "$branch_behind" == 1 ]]; then
|
||||
echo "$sexy_bash_prompt_dirty_unpushed_unpulled_symbol"
|
||||
elif [[ "$branch_ahead" == 1 && "$branch_behind" == 1 ]]; then
|
||||
echo "$sexy_bash_prompt_unpushed_unpulled_symbol"
|
||||
elif [[ "$dirty_branch" == 1 && "$branch_ahead" == 1 ]]; then
|
||||
echo "$sexy_bash_prompt_dirty_unpushed_symbol"
|
||||
elif [[ "$branch_ahead" == 1 ]]; then
|
||||
echo "$sexy_bash_prompt_unpushed_symbol"
|
||||
elif [[ "$dirty_branch" == 1 && "$branch_behind" == 1 ]]; then
|
||||
echo "$sexy_bash_prompt_dirty_unpulled_symbol"
|
||||
elif [[ "$branch_behind" == 1 ]]; then
|
||||
echo "$sexy_bash_prompt_unpulled_symbol"
|
||||
elif [[ "$dirty_branch" == 1 ]]; then
|
||||
echo "$sexy_bash_prompt_dirty_synced_symbol"
|
||||
else # clean
|
||||
echo "$sexy_bash_prompt_synced_symbol"
|
||||
fi
|
||||
}
|
||||
|
||||
sexy_bash_prompt_get_git_info () {
|
||||
# Grab the branch
|
||||
branch="$(sexy_bash_prompt_get_git_branch)"
|
||||
|
||||
# If there are any branches
|
||||
if [[ "$branch" != "" ]]; then
|
||||
# Echo the branch
|
||||
output="$branch"
|
||||
|
||||
# Add on the git status
|
||||
output="$output$(sexy_bash_prompt_get_git_status)"
|
||||
|
||||
# Echo our output
|
||||
echo "$output"
|
||||
fi
|
||||
}
|
||||
|
||||
# Define the sexy-bash-prompt
|
||||
PS1="\[$sexy_bash_prompt_user_color\]\u\[$sexy_bash_prompt_reset\] \
|
||||
\[$sexy_bash_prompt_preposition_color\]at\[$sexy_bash_prompt_reset\] \
|
||||
\[$sexy_bash_prompt_device_color\]\h\[$sexy_bash_prompt_reset\] \
|
||||
\[$sexy_bash_prompt_preposition_color\]in\[$sexy_bash_prompt_reset\] \
|
||||
\[$sexy_bash_prompt_dir_color\]\w\[$sexy_bash_prompt_reset\]\
|
||||
\$( sexy_bash_prompt_is_on_git && \
|
||||
echo -n \" \[$sexy_bash_prompt_preposition_color\]on\[$sexy_bash_prompt_reset\] \" && \
|
||||
echo -n \"\[$sexy_bash_prompt_git_status_color\]\$(sexy_bash_prompt_get_git_info)\" && \
|
||||
echo -n \"\[$sexy_bash_prompt_git_progress_color\]\$(sexy_bash_prompt_get_git_progress)\" && \
|
||||
echo -n \"\[$sexy_bash_prompt_preposition_color\]\")\n\[$sexy_bash_prompt_reset\]\
|
||||
\[$sexy_bash_prompt_symbol_color\]$sexy_bash_prompt_symbol \[$sexy_bash_prompt_reset\]"
|
||||
|
||||
16
bashrc
16
bashrc
@@ -55,22 +55,6 @@ if [ -n "$force_color_prompt" ]; then
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ "$color_prompt" = yes ]; then
|
||||
PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
|
||||
else
|
||||
PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
|
||||
fi
|
||||
unset color_prompt force_color_prompt
|
||||
|
||||
# If this is an xterm set the title to user@host:dir
|
||||
case "$TERM" in
|
||||
xterm*|rxvt*)
|
||||
PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1"
|
||||
;;
|
||||
*)
|
||||
;;
|
||||
esac
|
||||
|
||||
# enable color support of ls and also add handy aliases
|
||||
if [ -x /usr/bin/dircolors ]; then
|
||||
test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
|
||||
|
||||
Reference in New Issue
Block a user