Merge branch 'master' into clean/theme_atomic_and_axin
BarbUk
GitHub
commit
bd6dbd3edf
|
|
@ -1,137 +1,197 @@
|
||||||
|
# shellcheck shell=bash
|
||||||
cite 'about-alias'
|
cite 'about-alias'
|
||||||
about-alias 'common git abbreviations'
|
about-alias 'common git abbreviations'
|
||||||
|
|
||||||
# Aliases
|
|
||||||
alias gcl='git clone'
|
|
||||||
alias ga='git add'
|
|
||||||
alias grm='git rm'
|
|
||||||
alias gap='git add -p'
|
|
||||||
alias gall='git add -A'
|
|
||||||
alias gf='git fetch --all --prune'
|
|
||||||
alias gft='git fetch --all --prune --tags'
|
|
||||||
alias gfv='git fetch --all --prune --verbose'
|
|
||||||
alias gftv='git fetch --all --prune --tags --verbose'
|
|
||||||
alias gus='git reset HEAD'
|
|
||||||
alias gpristine='git reset --hard && git clean -dfx'
|
|
||||||
alias gclean='git clean -fd'
|
|
||||||
alias gm="git merge"
|
|
||||||
alias gmv='git mv'
|
|
||||||
alias g='git'
|
alias g='git'
|
||||||
alias get='git'
|
alias get='git'
|
||||||
alias gs='git status'
|
|
||||||
alias gss='git status -s'
|
# add
|
||||||
alias gsu='git submodule update --init --recursive'
|
alias ga='git add'
|
||||||
alias gl='git pull'
|
alias gall='git add -A'
|
||||||
alias gpl='git pull'
|
alias gap='git add -p'
|
||||||
alias glum='git pull upstream master'
|
|
||||||
alias gpr='git pull --rebase'
|
# branch
|
||||||
alias gpp='git pull && git push'
|
alias gb='git branch'
|
||||||
alias gup='git fetch && git rebase'
|
alias gbD='git branch -D'
|
||||||
alias gp='git push'
|
alias gba='git branch -a'
|
||||||
alias gpd='git push --delete'
|
alias gbd='git branch -d'
|
||||||
alias gpo='git push origin HEAD'
|
alias gbm='git branch -m'
|
||||||
alias gpu='git push --set-upstream'
|
alias gbt='git branch --track'
|
||||||
alias gpuo='git push --set-upstream origin'
|
alias gdel='git branch -D'
|
||||||
alias gpuoc='git push --set-upstream origin $(git symbolic-ref --short HEAD)'
|
|
||||||
alias gpom='git push origin master'
|
# for-each-ref
|
||||||
alias gr='git remote'
|
alias gbc='git for-each-ref --format="%(authorname) %09 %(if)%(HEAD)%(then)*%(else)%(refname:short)%(end) %09 %(creatordate)" refs/remotes/ --sort=authorname DESC' # FROM https://stackoverflow.com/a/58623139/10362396
|
||||||
alias grv='git remote -v'
|
|
||||||
alias gra='git remote add'
|
# commit
|
||||||
alias grb='git rebase'
|
alias gc='git commit -v'
|
||||||
alias grm='git rebase master'
|
alias gca='git commit -v -a'
|
||||||
alias grmi='git rebase master -i'
|
alias gcaa='git commit -a --amend -C HEAD' # Add uncommitted and unstaged changes to the last commit
|
||||||
|
alias gcam='git commit -v -am'
|
||||||
|
alias gcamd='git commit --amend'
|
||||||
|
alias gcm='git commit -v -m'
|
||||||
|
alias gci='git commit --interactive'
|
||||||
|
alias gcsam='git commit -S -am'
|
||||||
|
|
||||||
|
# checkout
|
||||||
|
alias gcb='git checkout -b'
|
||||||
|
alias gco='git checkout'
|
||||||
|
alias gcob='git checkout -b'
|
||||||
|
alias gcobu='git checkout -b ${USER}/'
|
||||||
|
alias gcom='git checkout master'
|
||||||
|
alias gcpd='git checkout master; git pull; git branch -D'
|
||||||
|
alias gct='git checkout --track'
|
||||||
|
|
||||||
|
# clone
|
||||||
|
alias gcl='git clone'
|
||||||
|
|
||||||
|
# clean
|
||||||
|
alias gclean='git clean -fd'
|
||||||
|
|
||||||
|
# cherry-pick
|
||||||
|
alias gcp='git cherry-pick'
|
||||||
|
alias gcpx='git cherry-pick -x'
|
||||||
|
|
||||||
|
# diff
|
||||||
alias gd='git diff'
|
alias gd='git diff'
|
||||||
alias gds='git diff --staged'
|
alias gds='git diff --staged'
|
||||||
alias gdt='git difftool'
|
alias gdt='git difftool'
|
||||||
alias gdv='git diff -w "$@" | vim -R -'
|
|
||||||
alias gc='git commit -v'
|
|
||||||
alias gca='git commit -v -a'
|
|
||||||
alias gcm='git commit -v -m'
|
|
||||||
alias gcam="git commit -v -am"
|
|
||||||
alias gci='git commit --interactive'
|
|
||||||
alias gcamd='git commit --amend'
|
|
||||||
alias gb='git branch'
|
|
||||||
alias gba='git branch -a'
|
|
||||||
# FROM https://stackoverflow.com/a/58623139/10362396
|
|
||||||
alias gbc='git for-each-ref --format="%(authorname) %09 %(if)%(HEAD)%(then)*%(else)%(refname:short)%(end) %09 %(creatordate)" refs/remotes/ --sort=authorname DESC'
|
|
||||||
alias gbt='git branch --track'
|
|
||||||
alias gbm='git branch -m'
|
|
||||||
alias gbd='git branch -d'
|
|
||||||
alias gbD='git branch -D'
|
|
||||||
alias gcount='git shortlog -sn'
|
|
||||||
alias gcp='git cherry-pick'
|
|
||||||
alias gcpx='git cherry-pick -x'
|
|
||||||
alias gco='git checkout'
|
|
||||||
alias gcom='git checkout master'
|
|
||||||
alias gcb='git checkout -b'
|
|
||||||
alias gcob='git checkout -b'
|
|
||||||
alias gcobu='git checkout -b ${USER}/'
|
|
||||||
alias gct='git checkout --track'
|
|
||||||
alias gcpd='git checkout master; git pull; git branch -D'
|
|
||||||
alias gexport='git archive --format zip --output'
|
|
||||||
alias gdel='git branch -D'
|
|
||||||
alias gmu='git fetch origin -v; git fetch upstream -v; git merge upstream/master'
|
|
||||||
alias gll='git log --graph --pretty=oneline --abbrev-commit'
|
|
||||||
alias gg="git log --graph --pretty=format:'%C(bold)%h%Creset%C(magenta)%d%Creset %s %C(yellow)<%an> %C(cyan)(%cr)%Creset' --abbrev-commit --date=relative"
|
|
||||||
alias ggf="git log --graph --date=short --pretty=format:'%C(auto)%h %Cgreen%an%Creset %Cblue%cd%Creset %C(auto)%d %s'"
|
|
||||||
alias ggs="gg --stat"
|
|
||||||
alias gsh="git show"
|
|
||||||
alias gsl="git shortlog -sn"
|
|
||||||
alias gwc="git whatchanged"
|
|
||||||
alias gt="git tag"
|
|
||||||
alias gta="git tag -a"
|
|
||||||
alias gtd="git tag -d"
|
|
||||||
alias gtl="git tag -l"
|
|
||||||
alias gpatch="git format-patch -1"
|
|
||||||
# From http://blogs.atlassian.com/2014/10/advanced-git-aliases/
|
|
||||||
# Show commits since last pull
|
|
||||||
alias gnew="git log HEAD@{1}..HEAD@{0}"
|
|
||||||
# Add uncommitted and unstaged changes to the last commit
|
|
||||||
alias gcaa="git commit -a --amend -C HEAD"
|
|
||||||
# Rebase with latest remote master
|
|
||||||
alias gprom="git fetch origin master && git rebase origin/master && git update-ref refs/heads/master origin/master"
|
|
||||||
alias gpf="git push --force"
|
|
||||||
alias gpunch="git push --force-with-lease"
|
|
||||||
alias ggui="git gui"
|
|
||||||
alias gcsam="git commit -S -am"
|
|
||||||
# Stash aliases
|
|
||||||
alias gst="git stash"
|
|
||||||
alias gstb="git stash branch"
|
|
||||||
alias gstd="git stash drop"
|
|
||||||
alias gstl="git stash list"
|
|
||||||
# Push introduced in git v2.13.2
|
|
||||||
alias gstpu="git stash push"
|
|
||||||
alias gstpum="git stash push -m"
|
|
||||||
# Save deprecated since git v2.16.0
|
|
||||||
# - aliases now resolve to push
|
|
||||||
alias gsts="git stash push"
|
|
||||||
alias gstsm="git stash push -m"
|
|
||||||
# Alias gstpo added for symmetry with gstpu (push)
|
|
||||||
# - gstp remains as alias for pop due to long-standing usage
|
|
||||||
alias gstpo="git stash pop"
|
|
||||||
alias gstp="git stash pop"
|
|
||||||
# Switch aliases - Requires git v2.23+
|
|
||||||
alias gsw="git switch"
|
|
||||||
alias gswm="git switch master"
|
|
||||||
alias gswc="git switch --create"
|
|
||||||
alias gswt="git switch --track"
|
|
||||||
# Git home
|
|
||||||
alias ghm='cd "$(git rev-parse --show-toplevel)"'
|
|
||||||
if ! _command_exists gh; then
|
|
||||||
alias gh='ghm'
|
|
||||||
fi
|
|
||||||
# Show untracked files
|
|
||||||
alias gu='git ls-files . --exclude-standard --others'
|
|
||||||
|
|
||||||
# Git SVN
|
# archive
|
||||||
alias gsr='git svn rebase'
|
alias gexport='git archive --format zip --output'
|
||||||
|
|
||||||
|
# fetch
|
||||||
|
alias gf='git fetch --all --prune'
|
||||||
|
alias gft='git fetch --all --prune --tags'
|
||||||
|
alias gftv='git fetch --all --prune --tags --verbose'
|
||||||
|
alias gfv='git fetch --all --prune --verbose'
|
||||||
|
alias gmu='git fetch origin -v; git fetch upstream -v; git merge upstream/master'
|
||||||
|
alias gup='git fetch && git rebase'
|
||||||
|
|
||||||
|
# log
|
||||||
|
alias gg='git log --graph --pretty=format:'\''%C(bold)%h%Creset%C(magenta)%d%Creset %s %C(yellow)<%an> %C(cyan)(%cr)%Creset'\'' --abbrev-commit --date=relative'
|
||||||
|
alias ggf='git log --graph --date=short --pretty=format:'\''%C(auto)%h %Cgreen%an%Creset %Cblue%cd%Creset %C(auto)%d %s'\'''
|
||||||
|
alias ggs='gg --stat'
|
||||||
|
alias gll='git log --graph --pretty=oneline --abbrev-commit'
|
||||||
|
alias gnew='git log HEAD@{1}..HEAD@{0}' # Show commits since last pull, see http://blogs.atlassian.com/2014/10/advanced-git-aliases/
|
||||||
|
alias gwc='git whatchanged'
|
||||||
|
|
||||||
|
# ls-files
|
||||||
|
alias gu='git ls-files . --exclude-standard --others' # Show untracked files
|
||||||
|
alias glsut='gu'
|
||||||
|
alias glsum='git diff --name-only --diff-filter=U' # Show unmerged (conflicted) files
|
||||||
|
|
||||||
|
# gui
|
||||||
|
alias ggui='git gui'
|
||||||
|
|
||||||
|
# home
|
||||||
|
alias ghm='cd '\''$(git rev-parse --show-toplevel)'\''' # Git home
|
||||||
|
# appendage to ghm
|
||||||
|
if ! _command_exists gh; then
|
||||||
|
alias gh='ghm'
|
||||||
|
fi
|
||||||
|
|
||||||
|
# merge
|
||||||
|
alias gm='git merge'
|
||||||
|
|
||||||
|
# mv
|
||||||
|
alias gmv='git mv'
|
||||||
|
|
||||||
|
# patch
|
||||||
|
alias gpatch='git format-patch -1'
|
||||||
|
|
||||||
|
# push
|
||||||
|
alias gp='git push'
|
||||||
|
alias gpd='git push --delete'
|
||||||
|
alias gpf='git push --force'
|
||||||
|
alias gpo='git push origin HEAD'
|
||||||
|
alias gpom='git push origin master'
|
||||||
|
alias gpu='git push --set-upstream'
|
||||||
|
alias gpunch='git push --force-with-lease'
|
||||||
|
alias gpuo='git push --set-upstream origin'
|
||||||
|
alias gpuoc='git push --set-upstream origin $(git symbolic-ref --short HEAD)'
|
||||||
|
|
||||||
|
# pull
|
||||||
|
alias gl='git pull'
|
||||||
|
alias glum='git pull upstream master'
|
||||||
|
alias gpl='git pull'
|
||||||
|
alias gpp='git pull && git push'
|
||||||
|
alias gpr='git pull --rebase'
|
||||||
|
|
||||||
|
# remote
|
||||||
|
alias gr='git remote'
|
||||||
|
alias gra='git remote add'
|
||||||
|
alias grv='git remote -v'
|
||||||
|
|
||||||
|
# rm
|
||||||
|
alias grm='git rm'
|
||||||
|
|
||||||
|
# rebase
|
||||||
|
alias grb='git rebase'
|
||||||
|
alias grm='git rebase master'
|
||||||
|
alias grmi='git rebase master -i'
|
||||||
|
alias gprom='git fetch origin master && git rebase origin/master && git update-ref refs/heads/master origin/master' # Rebase with latest remote master
|
||||||
|
|
||||||
|
# reset
|
||||||
|
alias gus='git reset HEAD'
|
||||||
|
alias gpristine='git reset --hard && git clean -dfx'
|
||||||
|
|
||||||
|
# status
|
||||||
|
alias gs='git status'
|
||||||
|
alias gss='git status -s'
|
||||||
|
|
||||||
|
# shortlog
|
||||||
|
alias gcount='git shortlog -sn'
|
||||||
|
alias gsl='git shortlog -sn'
|
||||||
|
|
||||||
|
# show
|
||||||
|
alias gsh='git show'
|
||||||
|
|
||||||
|
# svn
|
||||||
alias gsd='git svn dcommit'
|
alias gsd='git svn dcommit'
|
||||||
|
alias gsr='git svn rebase' # Git SVN
|
||||||
|
|
||||||
|
# stash
|
||||||
|
alias gst='git stash'
|
||||||
|
alias gstb='git stash branch'
|
||||||
|
alias gstd='git stash drop'
|
||||||
|
alias gstl='git stash list'
|
||||||
|
alias gstp='git stash pop' # kept due to long-standing usage
|
||||||
|
alias gstpo='git stash pop' # recommended for it's symmetry with gstpu (push)
|
||||||
|
|
||||||
|
## 'stash push' introduced in git v2.13.2
|
||||||
|
alias gstpu='git stash push'
|
||||||
|
alias gstpum='git stash push -m'
|
||||||
|
|
||||||
|
## 'stash save' deprecated since git v2.16.0, alias is now push
|
||||||
|
alias gsts='git stash push'
|
||||||
|
alias gstsm='git stash push -m'
|
||||||
|
|
||||||
|
# submodules
|
||||||
|
alias gsu='git submodule update --init --recursive'
|
||||||
|
|
||||||
|
# switch
|
||||||
|
# these aliases requires git v2.23+
|
||||||
|
alias gsw='git switch'
|
||||||
|
alias gswc='git switch --create'
|
||||||
|
alias gswm='git switch master'
|
||||||
|
alias gswt='git switch --track'
|
||||||
|
|
||||||
|
# tag
|
||||||
|
alias gt='git tag'
|
||||||
|
alias gta='git tag -a'
|
||||||
|
alias gtd='git tag -d'
|
||||||
|
alias gtl='git tag -l'
|
||||||
|
|
||||||
case $OSTYPE in
|
case $OSTYPE in
|
||||||
darwin*)
|
darwin*)
|
||||||
alias gtls="git tag -l | gsort -V"
|
alias gtls="git tag -l | gsort -V"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
alias gtls='git tag -l | sort -V'
|
alias gtls='git tag -l | sort -V'
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
# functions
|
||||||
|
function gdv() {
|
||||||
|
git diff --ignore-all-space "$@" | vim -R -
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -32,6 +32,7 @@ themes/powerline
|
||||||
themes/barbuk
|
themes/barbuk
|
||||||
themes/atomic
|
themes/atomic
|
||||||
themes/axin
|
themes/axin
|
||||||
|
themes/base.theme.bash
|
||||||
|
|
||||||
# plugins
|
# plugins
|
||||||
#
|
#
|
||||||
|
|
@ -48,5 +49,7 @@ completion/available/vault.completion.bash
|
||||||
completion/available/sdkman.completion.bash
|
completion/available/sdkman.completion.bash
|
||||||
|
|
||||||
# aliases
|
# aliases
|
||||||
|
#
|
||||||
aliases/available/dnf.aliases.bash
|
aliases/available/dnf.aliases.bash
|
||||||
aliases/available/vim.aliases.bash
|
aliases/available/vim.aliases.bash
|
||||||
|
aliases/available/git.aliases.bash
|
||||||
|
|
|
||||||
|
|
@ -59,8 +59,18 @@ _sdkman_candidate_all_versions() {
|
||||||
if [ "$SDKMAN_OFFLINE_MODE" = "true" ]; then
|
if [ "$SDKMAN_OFFLINE_MODE" = "true" ]; then
|
||||||
CANDIDATE_VERSIONS=$CANDIDATE_LOCAL_VERSIONS
|
CANDIDATE_VERSIONS=$CANDIDATE_LOCAL_VERSIONS
|
||||||
else
|
else
|
||||||
CANDIDATE_ONLINE_VERSIONS="$(__sdkman_list_versions "$1" | grep " " | grep "\." | cut -c 62-)"
|
# sdkman has a specific output format for Java candidate since
|
||||||
CANDIDATE_VERSIONS="$(echo "$CANDIDATE_ONLINE_VERSIONS $CANDIDATE_LOCAL_VERSIONS" | tr ' ' '\n' | sort | uniq -u) "
|
# there are multiple vendors and builds.
|
||||||
|
if [ "$candidate" = "java" ]; then
|
||||||
|
CANDIDATE_ONLINE_VERSIONS="$(__sdkman_list_versions "$candidate" | grep " " | grep "\." | cut -c 62-)"
|
||||||
|
else
|
||||||
|
CANDIDATE_ONLINE_VERSIONS="$(__sdkman_list_versions "$candidate" | grep " " | grep "\." | cut -c 6-)"
|
||||||
|
fi
|
||||||
|
# the last grep is used to filter out sdkman flags, such as:
|
||||||
|
# "+" - local version
|
||||||
|
# "*" - installed
|
||||||
|
# ">" - currently in use
|
||||||
|
CANDIDATE_VERSIONS="$(echo "$CANDIDATE_ONLINE_VERSIONS $CANDIDATE_LOCAL_VERSIONS" | tr ' ' '\n' | grep -v -e '^[[:space:]|\*|\>|\+]*$' | sort | uniq -u) "
|
||||||
fi
|
fi
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,48 @@
|
||||||
#!/usr/bin/bash
|
#!/usr/bin/bash
|
||||||
|
|
||||||
if command -v vue > /dev/null; then
|
if _command_exists vue; then
|
||||||
__vuejs_completion() {
|
__vuejs_completion() {
|
||||||
local OPTS=("--version --help create add invoke inspect serve build ui init config upgrade info")
|
local prev=$(_get_pword)
|
||||||
COMPREPLY=()
|
local curr=$(_get_cword)
|
||||||
for _opt_ in ${OPTS[@]}; do
|
|
||||||
if [[ "$_opt_" == "$2"* ]]; then
|
case $prev in
|
||||||
COMPREPLY+=("$_opt_")
|
create)
|
||||||
fi
|
COMPREPLY=($(compgen -W "-p -d -i -m -r -g -n -f -c -x -b -h --help --preset --default --inilinePreset --packageManager --registry --git --no-git --force --merge --clone --proxy --bare --skipGetStarted" -- "$curr"))
|
||||||
done
|
;;
|
||||||
|
add|invoke)
|
||||||
|
COMPREPLY=($(compgen -W "--registry -h --help" -- "$curr"))
|
||||||
|
;;
|
||||||
|
inspect)
|
||||||
|
COMPREPLY=($(compgen -W "-v --help --verbose --mode --rule --plugin --plugins --rules" -- "$curr"))
|
||||||
|
;;
|
||||||
|
serve)
|
||||||
|
COMPREPLY=($(compgen -W "-o -h --help --open -c --copy -p --port" -- "$curr"))
|
||||||
|
;;
|
||||||
|
build)
|
||||||
|
COMPREPLY=($(compgen -W "-t --target -n --name -d --dest -h --help" -- "$curr"))
|
||||||
|
;;
|
||||||
|
ui)
|
||||||
|
COMPREPLY=($(compgen -W "-H --host -p --port -D --dev --quiet --headless -h --help" -- "$curr"))
|
||||||
|
;;
|
||||||
|
init)
|
||||||
|
COMPREPLY=($(compgen -W "-c --clone --offline -h --help" -- "$curr"))
|
||||||
|
;;
|
||||||
|
config)
|
||||||
|
COMPREPLY=($(compgen -W "-g --get -s --set -d --delete -e --edit --json -h --help" -- "$curr"))
|
||||||
|
;;
|
||||||
|
outdated)
|
||||||
|
COMPREPLY=($(compgen -W "--next -h --help" -- "$curr"))
|
||||||
|
;;
|
||||||
|
upgrade)
|
||||||
|
COMPREPLY=($(compgen -W "-t --to -f --from -r --registry --all --next -h --help" -- "$curr"))
|
||||||
|
;;
|
||||||
|
migrate)
|
||||||
|
COMPREPLY=($(compgen -W "-f --from -h --help" -- "$curr"))
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
COMPREPLY=($(compgen -W "-h --help -v --version create add invoke inspect serve build ui init config outdated upgrade migrate info" -- "$curr"))
|
||||||
|
;;
|
||||||
|
esac
|
||||||
}
|
}
|
||||||
|
|
||||||
complete -F __vuejs_completion vue
|
complete -F __vuejs_completion vue
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#!/usr/bin/env bash
|
# shellcheck shell=bash
|
||||||
|
|
||||||
CLOCK_CHAR_THEME_PROMPT_PREFIX=''
|
CLOCK_CHAR_THEME_PROMPT_PREFIX=''
|
||||||
CLOCK_CHAR_THEME_PROMPT_SUFFIX=''
|
CLOCK_CHAR_THEME_PROMPT_SUFFIX=''
|
||||||
|
|
@ -92,214 +92,228 @@ SVN_EXE=$(which svn 2> /dev/null || true)
|
||||||
|
|
||||||
# Check for broken SVN exe that is caused by some versions of Xcode.
|
# Check for broken SVN exe that is caused by some versions of Xcode.
|
||||||
# See https://github.com/Bash-it/bash-it/issues/1612 for more details.
|
# See https://github.com/Bash-it/bash-it/issues/1612 for more details.
|
||||||
if [[ -x "$SVN_EXE" ]] ; then
|
if [[ -x "$SVN_EXE" ]]; then
|
||||||
if ! "$SVN_EXE" --version > /dev/null 2>&1 ; then
|
if ! "$SVN_EXE" --version > /dev/null 2>&1; then
|
||||||
# Unset the SVN exe variable so that SVN commands are avoided.
|
# Unset the SVN exe variable so that SVN commands are avoided.
|
||||||
SVN_EXE=""
|
SVN_EXE=""
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
function scm {
|
function scm {
|
||||||
if [[ "$SCM_CHECK" = false ]]; then SCM=$SCM_NONE
|
if [[ "$SCM_CHECK" = false ]]; then
|
||||||
elif [[ -f .git/HEAD ]] && [[ -x "$GIT_EXE" ]]; then SCM=$SCM_GIT
|
SCM=$SCM_NONE
|
||||||
elif [[ -x "$GIT_EXE" ]] && [[ -n "$(git rev-parse --is-inside-work-tree 2> /dev/null)" ]]; then SCM=$SCM_GIT
|
elif [[ -f .git/HEAD ]] && [[ -x "$GIT_EXE" ]]; then
|
||||||
elif [[ -x "$P4_EXE" ]] && [[ -n "$(p4 set P4CLIENT 2> /dev/null)" ]]; then SCM=$SCM_P4
|
SCM=$SCM_GIT
|
||||||
elif [[ -d .hg ]] && [[ -x "$HG_EXE" ]]; then SCM=$SCM_HG
|
elif [[ -x "$GIT_EXE" ]] && [[ -n "$(git rev-parse --is-inside-work-tree 2> /dev/null)" ]]; then
|
||||||
elif [[ -x "$HG_EXE" ]] && [[ -n "$(hg root 2> /dev/null)" ]]; then SCM=$SCM_HG
|
SCM=$SCM_GIT
|
||||||
elif [[ -d .svn ]] && [[ -x "$SVN_EXE" ]]; then SCM=$SCM_SVN
|
elif [[ -x "$P4_EXE" ]] && [[ -n "$(p4 set P4CLIENT 2> /dev/null)" ]]; then
|
||||||
elif [[ -x "$SVN_EXE" ]] && [[ -n "$(svn info --show-item wc-root 2>/dev/null)" ]]; then SCM=$SCM_SVN
|
SCM=$SCM_P4
|
||||||
else SCM=$SCM_NONE
|
elif [[ -d .hg ]] && [[ -x "$HG_EXE" ]]; then
|
||||||
fi
|
SCM=$SCM_HG
|
||||||
|
elif [[ -x "$HG_EXE" ]] && [[ -n "$(hg root 2> /dev/null)" ]]; then
|
||||||
|
SCM=$SCM_HG
|
||||||
|
elif [[ -d .svn ]] && [[ -x "$SVN_EXE" ]]; then
|
||||||
|
SCM=$SCM_SVN
|
||||||
|
elif [[ -x "$SVN_EXE" ]] && [[ -n "$(svn info --show-item wc-root 2> /dev/null)" ]]; then
|
||||||
|
SCM=$SCM_SVN
|
||||||
|
else
|
||||||
|
SCM=$SCM_NONE
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
function scm_prompt_char {
|
function scm_prompt_char {
|
||||||
if [[ -z $SCM ]]; then scm; fi
|
if [[ -z $SCM ]]; then scm; fi
|
||||||
if [[ $SCM == $SCM_GIT ]]; then SCM_CHAR=$SCM_GIT_CHAR
|
if [[ $SCM == "$SCM_GIT" ]]; then
|
||||||
elif [[ $SCM == $SCM_P4 ]]; then SCM_CHAR=$SCM_P4_CHAR
|
SCM_CHAR=$SCM_GIT_CHAR
|
||||||
elif [[ $SCM == $SCM_HG ]]; then SCM_CHAR=$SCM_HG_CHAR
|
elif [[ $SCM == "$SCM_P4" ]]; then
|
||||||
elif [[ $SCM == $SCM_SVN ]]; then SCM_CHAR=$SCM_SVN_CHAR
|
SCM_CHAR=$SCM_P4_CHAR
|
||||||
else SCM_CHAR=$SCM_NONE_CHAR
|
elif [[ $SCM == "$SCM_HG" ]]; then
|
||||||
fi
|
SCM_CHAR=$SCM_HG_CHAR
|
||||||
|
elif [[ $SCM == "$SCM_SVN" ]]; then
|
||||||
|
SCM_CHAR=$SCM_SVN_CHAR
|
||||||
|
else
|
||||||
|
SCM_CHAR=$SCM_NONE_CHAR
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
function scm_prompt_vars {
|
function scm_prompt_vars {
|
||||||
scm
|
scm
|
||||||
scm_prompt_char
|
scm_prompt_char
|
||||||
SCM_DIRTY=0
|
SCM_DIRTY=0
|
||||||
SCM_STATE=''
|
SCM_STATE=''
|
||||||
[[ $SCM == $SCM_GIT ]] && git_prompt_vars && return
|
[[ $SCM == "$SCM_GIT" ]] && git_prompt_vars && return
|
||||||
[[ $SCM == $SCM_P4 ]] && p4_prompt_vars && return
|
[[ $SCM == "$SCM_P4" ]] && p4_prompt_vars && return
|
||||||
[[ $SCM == $SCM_HG ]] && hg_prompt_vars && return
|
[[ $SCM == "$SCM_HG" ]] && hg_prompt_vars && return
|
||||||
[[ $SCM == $SCM_SVN ]] && svn_prompt_vars && return
|
[[ $SCM == "$SCM_SVN" ]] && svn_prompt_vars && return
|
||||||
}
|
}
|
||||||
|
|
||||||
function scm_prompt_info {
|
function scm_prompt_info {
|
||||||
scm
|
scm
|
||||||
scm_prompt_char
|
scm_prompt_char
|
||||||
scm_prompt_info_common
|
scm_prompt_info_common
|
||||||
}
|
}
|
||||||
|
|
||||||
function scm_prompt_char_info {
|
function scm_prompt_char_info {
|
||||||
scm_prompt_char
|
scm_prompt_char
|
||||||
echo -ne "${SCM_THEME_CHAR_PREFIX}${SCM_CHAR}${SCM_THEME_CHAR_SUFFIX}"
|
echo -ne "${SCM_THEME_CHAR_PREFIX}${SCM_CHAR}${SCM_THEME_CHAR_SUFFIX}"
|
||||||
scm_prompt_info_common
|
scm_prompt_info_common
|
||||||
}
|
}
|
||||||
|
|
||||||
function scm_prompt_info_common {
|
function scm_prompt_info_common {
|
||||||
SCM_DIRTY=0
|
SCM_DIRTY=0
|
||||||
SCM_STATE=''
|
SCM_STATE=''
|
||||||
|
|
||||||
if [[ ${SCM} == ${SCM_GIT} ]]; then
|
if [[ ${SCM} == "${SCM_GIT}" ]]; then
|
||||||
if [[ ${SCM_GIT_SHOW_MINIMAL_INFO} == true ]]; then
|
if [[ ${SCM_GIT_SHOW_MINIMAL_INFO} == true ]]; then
|
||||||
# user requests minimal git status information
|
# user requests minimal git status information
|
||||||
git_prompt_minimal_info
|
git_prompt_minimal_info
|
||||||
else
|
else
|
||||||
# more detailed git status
|
# more detailed git status
|
||||||
git_prompt_info
|
git_prompt_info
|
||||||
fi
|
fi
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# TODO: consider adding minimal status information for hg and svn
|
# TODO: consider adding minimal status information for hg and svn
|
||||||
{ [[ ${SCM} == ${SCM_P4} ]] && p4_prompt_info && return; } || true
|
{ [[ ${SCM} == "${SCM_P4}" ]] && p4_prompt_info && return; } || true
|
||||||
{ [[ ${SCM} == ${SCM_HG} ]] && hg_prompt_info && return; } || true
|
{ [[ ${SCM} == "${SCM_HG}" ]] && hg_prompt_info && return; } || true
|
||||||
{ [[ ${SCM} == ${SCM_SVN} ]] && svn_prompt_info && return; } || true
|
{ [[ ${SCM} == "${SCM_SVN}" ]] && svn_prompt_info && return; } || true
|
||||||
}
|
}
|
||||||
|
|
||||||
function terraform_workspace_prompt {
|
function terraform_workspace_prompt {
|
||||||
if _command_exists terraform ; then
|
if _command_exists terraform; then
|
||||||
if [ -d .terraform ]; then
|
if [ -d .terraform ]; then
|
||||||
echo -e "$(terraform workspace show 2>/dev/null)"
|
echo -e "$(terraform workspace show 2> /dev/null)"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
function git_prompt_minimal_info {
|
function git_prompt_minimal_info {
|
||||||
SCM_STATE=${SCM_THEME_PROMPT_CLEAN}
|
SCM_STATE=${SCM_THEME_PROMPT_CLEAN}
|
||||||
|
|
||||||
_git-hide-status && return
|
_git-hide-status && return
|
||||||
|
|
||||||
SCM_BRANCH="${SCM_THEME_BRANCH_PREFIX}\$(_git-friendly-ref)"
|
SCM_BRANCH="${SCM_THEME_BRANCH_PREFIX}\$(_git-friendly-ref)"
|
||||||
|
|
||||||
if [[ -n "$(_git-status | tail -n1)" ]]; then
|
if [[ -n "$(_git-status | tail -n1)" ]]; then
|
||||||
SCM_DIRTY=1
|
SCM_DIRTY=1
|
||||||
SCM_STATE=${SCM_THEME_PROMPT_DIRTY}
|
SCM_STATE=${SCM_THEME_PROMPT_DIRTY}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Output the git prompt
|
# Output the git prompt
|
||||||
SCM_PREFIX=${SCM_THEME_PROMPT_PREFIX}
|
SCM_PREFIX=${SCM_THEME_PROMPT_PREFIX}
|
||||||
SCM_SUFFIX=${SCM_THEME_PROMPT_SUFFIX}
|
SCM_SUFFIX=${SCM_THEME_PROMPT_SUFFIX}
|
||||||
echo -e "${SCM_PREFIX}${SCM_BRANCH}${SCM_STATE}${SCM_SUFFIX}"
|
echo -e "${SCM_PREFIX}${SCM_BRANCH}${SCM_STATE}${SCM_SUFFIX}"
|
||||||
}
|
}
|
||||||
|
|
||||||
function git_prompt_vars {
|
function git_prompt_vars {
|
||||||
if ${SCM_GIT_USE_GITSTATUS} && _command_exists gitstatus_query && gitstatus_query && [[ "${VCS_STATUS_RESULT}" == "ok-sync" ]]; then # use faster gitstatus
|
if ${SCM_GIT_USE_GITSTATUS} && _command_exists gitstatus_query && gitstatus_query && [[ "${VCS_STATUS_RESULT}" == "ok-sync" ]]; then # use faster gitstatus
|
||||||
SCM_GIT_GITSTATUS_RAN=true # use this in githelpers and below to choose gitstatus output
|
SCM_GIT_GITSTATUS_RAN=true # use this in githelpers and below to choose gitstatus output
|
||||||
else
|
else
|
||||||
SCM_GIT_GITSTATUS_RAN=false
|
SCM_GIT_GITSTATUS_RAN=false
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if _git-branch &> /dev/null; then
|
if _git-branch &> /dev/null; then
|
||||||
SCM_GIT_DETACHED="false"
|
SCM_GIT_DETACHED="false"
|
||||||
SCM_BRANCH="${SCM_THEME_BRANCH_PREFIX}\$(_git-friendly-ref)$(_git-remote-info)"
|
SCM_BRANCH="${SCM_THEME_BRANCH_PREFIX}\$(_git-friendly-ref)$(_git-remote-info)"
|
||||||
else
|
else
|
||||||
SCM_GIT_DETACHED="true"
|
SCM_GIT_DETACHED="true"
|
||||||
|
|
||||||
local detached_prefix
|
local detached_prefix
|
||||||
if _git-tag &> /dev/null; then
|
if _git-tag &> /dev/null; then
|
||||||
detached_prefix=${SCM_THEME_TAG_PREFIX}
|
detached_prefix=${SCM_THEME_TAG_PREFIX}
|
||||||
else
|
else
|
||||||
detached_prefix=${SCM_THEME_DETACHED_PREFIX}
|
detached_prefix=${SCM_THEME_DETACHED_PREFIX}
|
||||||
fi
|
fi
|
||||||
SCM_BRANCH="${detached_prefix}\$(_git-friendly-ref)"
|
SCM_BRANCH="${detached_prefix}\$(_git-friendly-ref)"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ "${SCM_GIT_GITSTATUS_RAN}" == "true" ]]; then
|
if [[ "${SCM_GIT_GITSTATUS_RAN}" == "true" ]]; then
|
||||||
commits_behind=${VCS_STATUS_COMMITS_BEHIND}
|
commits_behind=${VCS_STATUS_COMMITS_BEHIND}
|
||||||
commits_ahead=${VCS_STATUS_COMMITS_AHEAD}
|
commits_ahead=${VCS_STATUS_COMMITS_AHEAD}
|
||||||
else
|
else
|
||||||
IFS=$'\t' read -r commits_behind commits_ahead <<< "$(_git-upstream-behind-ahead)"
|
IFS=$'\t' read -r commits_behind commits_ahead <<< "$(_git-upstream-behind-ahead)"
|
||||||
fi
|
fi
|
||||||
if [[ "${commits_ahead}" -gt 0 ]]; then
|
if [[ "${commits_ahead}" -gt 0 ]]; then
|
||||||
SCM_BRANCH+="${SCM_GIT_AHEAD_BEHIND_PREFIX_CHAR}${SCM_GIT_AHEAD_CHAR}"
|
SCM_BRANCH+="${SCM_GIT_AHEAD_BEHIND_PREFIX_CHAR}${SCM_GIT_AHEAD_CHAR}"
|
||||||
[[ "${SCM_GIT_SHOW_COMMIT_COUNT}" = "true" ]] && SCM_BRANCH+="${commits_ahead}"
|
[[ "${SCM_GIT_SHOW_COMMIT_COUNT}" = "true" ]] && SCM_BRANCH+="${commits_ahead}"
|
||||||
fi
|
fi
|
||||||
if [[ "${commits_behind}" -gt 0 ]]; then
|
if [[ "${commits_behind}" -gt 0 ]]; then
|
||||||
SCM_BRANCH+="${SCM_GIT_AHEAD_BEHIND_PREFIX_CHAR}${SCM_GIT_BEHIND_CHAR}"
|
SCM_BRANCH+="${SCM_GIT_AHEAD_BEHIND_PREFIX_CHAR}${SCM_GIT_BEHIND_CHAR}"
|
||||||
[[ "${SCM_GIT_SHOW_COMMIT_COUNT}" = "true" ]] && SCM_BRANCH+="${commits_behind}"
|
[[ "${SCM_GIT_SHOW_COMMIT_COUNT}" = "true" ]] && SCM_BRANCH+="${commits_behind}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ "${SCM_GIT_SHOW_STASH_INFO}" = "true" ]]; then
|
if [[ "${SCM_GIT_SHOW_STASH_INFO}" = "true" ]]; then
|
||||||
local stash_count
|
local stash_count
|
||||||
if [[ "${SCM_GIT_GITSTATUS_RAN}" == "true" ]]; then
|
if [[ "${SCM_GIT_GITSTATUS_RAN}" == "true" ]]; then
|
||||||
stash_count=${VCS_STATUS_STASHES}
|
stash_count=${VCS_STATUS_STASHES}
|
||||||
else
|
else
|
||||||
stash_count="$(git stash list 2> /dev/null | wc -l | tr -d ' ')"
|
stash_count="$(git stash list 2> /dev/null | wc -l | tr -d ' ')"
|
||||||
fi
|
fi
|
||||||
[[ "${stash_count}" -gt 0 ]] && SCM_BRANCH+=" ${SCM_GIT_STASH_CHAR_PREFIX}${stash_count}${SCM_GIT_STASH_CHAR_SUFFIX}"
|
[[ "${stash_count}" -gt 0 ]] && SCM_BRANCH+=" ${SCM_GIT_STASH_CHAR_PREFIX}${stash_count}${SCM_GIT_STASH_CHAR_SUFFIX}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
SCM_STATE=${GIT_THEME_PROMPT_CLEAN:-$SCM_THEME_PROMPT_CLEAN}
|
SCM_STATE=${GIT_THEME_PROMPT_CLEAN:-$SCM_THEME_PROMPT_CLEAN}
|
||||||
if ! _git-hide-status; then
|
if ! _git-hide-status; then
|
||||||
if [[ "${SCM_GIT_GITSTATUS_RAN}" == "true" ]]; then
|
if [[ "${SCM_GIT_GITSTATUS_RAN}" == "true" ]]; then
|
||||||
untracked_count=${VCS_STATUS_NUM_UNTRACKED}
|
untracked_count=${VCS_STATUS_NUM_UNTRACKED}
|
||||||
unstaged_count=${VCS_STATUS_NUM_UNSTAGED}
|
unstaged_count=${VCS_STATUS_NUM_UNSTAGED}
|
||||||
staged_count=${VCS_STATUS_NUM_STAGED}
|
staged_count=${VCS_STATUS_NUM_STAGED}
|
||||||
else
|
else
|
||||||
IFS=$'\t' read -r untracked_count unstaged_count staged_count <<< "$(_git-status-counts)"
|
IFS=$'\t' read -r untracked_count unstaged_count staged_count <<< "$(_git-status-counts)"
|
||||||
fi
|
fi
|
||||||
if [[ "${untracked_count}" -gt 0 || "${unstaged_count}" -gt 0 || "${staged_count}" -gt 0 ]]; then
|
if [[ "${untracked_count}" -gt 0 || "${unstaged_count}" -gt 0 || "${staged_count}" -gt 0 ]]; then
|
||||||
SCM_DIRTY=1
|
SCM_DIRTY=1
|
||||||
if [[ "${SCM_GIT_SHOW_DETAILS}" = "true" ]]; then
|
if [[ "${SCM_GIT_SHOW_DETAILS}" = "true" ]]; then
|
||||||
[[ "${staged_count}" -gt 0 ]] && SCM_BRANCH+=" ${SCM_GIT_STAGED_CHAR}${staged_count}" && SCM_DIRTY=3
|
[[ "${staged_count}" -gt 0 ]] && SCM_BRANCH+=" ${SCM_GIT_STAGED_CHAR}${staged_count}" && SCM_DIRTY=3
|
||||||
[[ "${unstaged_count}" -gt 0 ]] && SCM_BRANCH+=" ${SCM_GIT_UNSTAGED_CHAR}${unstaged_count}" && SCM_DIRTY=2
|
[[ "${unstaged_count}" -gt 0 ]] && SCM_BRANCH+=" ${SCM_GIT_UNSTAGED_CHAR}${unstaged_count}" && SCM_DIRTY=2
|
||||||
[[ "${untracked_count}" -gt 0 ]] && SCM_BRANCH+=" ${SCM_GIT_UNTRACKED_CHAR}${untracked_count}" && SCM_DIRTY=1
|
[[ "${untracked_count}" -gt 0 ]] && SCM_BRANCH+=" ${SCM_GIT_UNTRACKED_CHAR}${untracked_count}" && SCM_DIRTY=1
|
||||||
fi
|
fi
|
||||||
SCM_STATE=${GIT_THEME_PROMPT_DIRTY:-$SCM_THEME_PROMPT_DIRTY}
|
SCM_STATE=${GIT_THEME_PROMPT_DIRTY:-$SCM_THEME_PROMPT_DIRTY}
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# no if for gitstatus here, user extraction is not supported by it
|
# no if for gitstatus here, user extraction is not supported by it
|
||||||
[[ "${SCM_GIT_SHOW_CURRENT_USER}" == "true" ]] && SCM_BRANCH+="$(git_user_info)"
|
[[ "${SCM_GIT_SHOW_CURRENT_USER}" == "true" ]] && SCM_BRANCH+="$(git_user_info)"
|
||||||
|
|
||||||
SCM_PREFIX=${GIT_THEME_PROMPT_PREFIX:-$SCM_THEME_PROMPT_PREFIX}
|
SCM_PREFIX=${GIT_THEME_PROMPT_PREFIX:-$SCM_THEME_PROMPT_PREFIX}
|
||||||
SCM_SUFFIX=${GIT_THEME_PROMPT_SUFFIX:-$SCM_THEME_PROMPT_SUFFIX}
|
SCM_SUFFIX=${GIT_THEME_PROMPT_SUFFIX:-$SCM_THEME_PROMPT_SUFFIX}
|
||||||
|
|
||||||
SCM_CHANGE=$(_git-short-sha 2>/dev/null || echo "")
|
SCM_CHANGE=$(_git-short-sha 2> /dev/null || echo "")
|
||||||
}
|
}
|
||||||
|
|
||||||
function p4_prompt_vars {
|
function p4_prompt_vars {
|
||||||
IFS=$'\t' read -r \
|
IFS=$'\t' read -r \
|
||||||
opened_count non_default_changes default_count \
|
opened_count non_default_changes default_count \
|
||||||
add_file_count edit_file_count delete_file_count \
|
add_file_count edit_file_count delete_file_count \
|
||||||
<<< "$(_p4-opened-counts)"
|
<<< "$(_p4-opened-counts)"
|
||||||
if [[ "${opened_count}" -gt 0 ]]; then
|
if [[ "${opened_count}" -gt 0 ]]; then
|
||||||
SCM_DIRTY=1
|
SCM_DIRTY=1
|
||||||
SCM_STATE=${SCM_THEME_PROMPT_DIRTY}
|
SCM_STATE=${SCM_THEME_PROMPT_DIRTY}
|
||||||
[[ "${opened_count}" -gt 0 ]] && SCM_BRANCH+=" ${SCM_P4_OPENED_CHAR}${opened_count}"
|
[[ "${opened_count}" -gt 0 ]] && SCM_BRANCH+=" ${SCM_P4_OPENED_CHAR}${opened_count}"
|
||||||
[[ "${non_default_changes}" -gt 0 ]] && SCM_BRANCH+=" ${SCM_P4_CHANGES_CHAR}${non_default_changes}"
|
[[ "${non_default_changes}" -gt 0 ]] && SCM_BRANCH+=" ${SCM_P4_CHANGES_CHAR}${non_default_changes}"
|
||||||
[[ "${default_count}" -gt 0 ]] && SCM_BRANCH+=" ${SCM_P4_DEFAULT_CHAR}${default_count}"
|
[[ "${default_count}" -gt 0 ]] && SCM_BRANCH+=" ${SCM_P4_DEFAULT_CHAR}${default_count}"
|
||||||
else
|
else
|
||||||
SCM_DIRTY=0
|
SCM_DIRTY=0
|
||||||
SCM_STATE=${SCM_THEME_PROMPT_DIRTY}
|
SCM_STATE=${SCM_THEME_PROMPT_DIRTY}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
SCM_PREFIX=${P4_THEME_PROMPT_PREFIX:-$SCM_THEME_PROMPT_PREFIX}
|
SCM_PREFIX=${P4_THEME_PROMPT_PREFIX:-$SCM_THEME_PROMPT_PREFIX}
|
||||||
SCM_SUFFIX=${P4_THEME_PROMPT_SUFFIX:-$SCM_THEME_PROMPT_SUFFIX}
|
SCM_SUFFIX=${P4_THEME_PROMPT_SUFFIX:-$SCM_THEME_PROMPT_SUFFIX}
|
||||||
}
|
}
|
||||||
|
|
||||||
function svn_prompt_vars {
|
function svn_prompt_vars {
|
||||||
if [[ -n $(svn status |head -c1 2> /dev/null) ]]; then
|
if [[ -n $(svn status | head -c1 2> /dev/null) ]]; then
|
||||||
SCM_DIRTY=1
|
SCM_DIRTY=1
|
||||||
SCM_STATE=${SVN_THEME_PROMPT_DIRTY:-$SCM_THEME_PROMPT_DIRTY}
|
SCM_STATE=${SVN_THEME_PROMPT_DIRTY:-$SCM_THEME_PROMPT_DIRTY}
|
||||||
else
|
else
|
||||||
SCM_DIRTY=0
|
SCM_DIRTY=0
|
||||||
SCM_STATE=${SVN_THEME_PROMPT_CLEAN:-$SCM_THEME_PROMPT_CLEAN}
|
SCM_STATE=${SVN_THEME_PROMPT_CLEAN:-$SCM_THEME_PROMPT_CLEAN}
|
||||||
fi
|
fi
|
||||||
SCM_PREFIX=${SVN_THEME_PROMPT_PREFIX:-$SCM_THEME_PROMPT_PREFIX}
|
SCM_PREFIX=${SVN_THEME_PROMPT_PREFIX:-$SCM_THEME_PROMPT_PREFIX}
|
||||||
SCM_SUFFIX=${SVN_THEME_PROMPT_SUFFIX:-$SCM_THEME_PROMPT_SUFFIX}
|
SCM_SUFFIX=${SVN_THEME_PROMPT_SUFFIX:-$SCM_THEME_PROMPT_SUFFIX}
|
||||||
SCM_BRANCH=$(svn info --show-item=url 2> /dev/null | awk -F/ '{ for (i=0; i<=NF; i++) { if ($i == "branches" || $i == "tags" ) { print $(i+1); break }; if ($i == "trunk") { print $i; break } } }') || return
|
SCM_BRANCH=$(svn info --show-item=url 2> /dev/null | awk -F/ '{ for (i=0; i<=NF; i++) { if ($i == "branches" || $i == "tags" ) { print $(i+1); break }; if ($i == "trunk") { print $i; break } } }') || return
|
||||||
SCM_CHANGE=$(svn info --show-item=revision 2> /dev/null)
|
SCM_CHANGE=$(svn info --show-item=revision 2> /dev/null)
|
||||||
}
|
}
|
||||||
|
|
||||||
# this functions returns absolute location of .hg directory if one exists
|
# this functions returns absolute location of .hg directory if one exists
|
||||||
|
|
@ -310,268 +324,268 @@ function svn_prompt_vars {
|
||||||
# - .hg is located in ~/Projects/Foo/.hg
|
# - .hg is located in ~/Projects/Foo/.hg
|
||||||
# - get_hg_root starts at ~/Projects/Foo/Bar and sees that there is no .hg directory, so then it goes into ~/Projects/Foo
|
# - get_hg_root starts at ~/Projects/Foo/Bar and sees that there is no .hg directory, so then it goes into ~/Projects/Foo
|
||||||
function get_hg_root {
|
function get_hg_root {
|
||||||
local CURRENT_DIR=$(pwd)
|
local CURRENT_DIR=$(pwd)
|
||||||
|
|
||||||
while [ "$CURRENT_DIR" != "/" ]; do
|
while [ "$CURRENT_DIR" != "/" ]; do
|
||||||
if [ -d "$CURRENT_DIR/.hg" ]; then
|
if [ -d "$CURRENT_DIR/.hg" ]; then
|
||||||
echo "$CURRENT_DIR/.hg"
|
echo "$CURRENT_DIR/.hg"
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
|
||||||
CURRENT_DIR=$(dirname $CURRENT_DIR)
|
CURRENT_DIR=$(dirname "$CURRENT_DIR")
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
function hg_prompt_vars {
|
function hg_prompt_vars {
|
||||||
if [[ -n $(hg status 2> /dev/null) ]]; then
|
if [[ -n $(hg status 2> /dev/null) ]]; then
|
||||||
SCM_DIRTY=1
|
SCM_DIRTY=1
|
||||||
SCM_STATE=${HG_THEME_PROMPT_DIRTY:-$SCM_THEME_PROMPT_DIRTY}
|
SCM_STATE=${HG_THEME_PROMPT_DIRTY:-$SCM_THEME_PROMPT_DIRTY}
|
||||||
else
|
else
|
||||||
SCM_DIRTY=0
|
SCM_DIRTY=0
|
||||||
SCM_STATE=${HG_THEME_PROMPT_CLEAN:-$SCM_THEME_PROMPT_CLEAN}
|
SCM_STATE=${HG_THEME_PROMPT_CLEAN:-$SCM_THEME_PROMPT_CLEAN}
|
||||||
fi
|
fi
|
||||||
SCM_PREFIX=${HG_THEME_PROMPT_PREFIX:-$SCM_THEME_PROMPT_PREFIX}
|
SCM_PREFIX=${HG_THEME_PROMPT_PREFIX:-$SCM_THEME_PROMPT_PREFIX}
|
||||||
SCM_SUFFIX=${HG_THEME_PROMPT_SUFFIX:-$SCM_THEME_PROMPT_SUFFIX}
|
SCM_SUFFIX=${HG_THEME_PROMPT_SUFFIX:-$SCM_THEME_PROMPT_SUFFIX}
|
||||||
|
|
||||||
HG_ROOT=$(get_hg_root)
|
HG_ROOT=$(get_hg_root)
|
||||||
|
|
||||||
if [ -f "$HG_ROOT/branch" ]; then
|
if [ -f "$HG_ROOT/branch" ]; then
|
||||||
# Mercurial holds it's current branch in .hg/branch file
|
# Mercurial holds it's current branch in .hg/branch file
|
||||||
SCM_BRANCH=$(cat "$HG_ROOT/branch")
|
SCM_BRANCH=$(cat "$HG_ROOT/branch")
|
||||||
else
|
else
|
||||||
SCM_BRANCH=$(hg summary 2> /dev/null | grep branch: | awk '{print $2}')
|
SCM_BRANCH=$(hg summary 2> /dev/null | grep branch: | awk '{print $2}')
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -f "$HG_ROOT/dirstate" ]; then
|
if [ -f "$HG_ROOT/dirstate" ]; then
|
||||||
# Mercurial holds various information about the working directory in .hg/dirstate file. More on http://mercurial.selenic.com/wiki/DirState
|
# Mercurial holds various information about the working directory in .hg/dirstate file. More on http://mercurial.selenic.com/wiki/DirState
|
||||||
SCM_CHANGE=$(hexdump -vn 10 -e '1/1 "%02x"' "$HG_ROOT/dirstate" | cut -c-12)
|
SCM_CHANGE=$(hexdump -vn 10 -e '1/1 "%02x"' "$HG_ROOT/dirstate" | cut -c-12)
|
||||||
else
|
else
|
||||||
SCM_CHANGE=$(hg summary 2> /dev/null | grep parent: | awk '{print $2}')
|
SCM_CHANGE=$(hg summary 2> /dev/null | grep parent: | awk '{print $2}')
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
function nvm_version_prompt {
|
function nvm_version_prompt {
|
||||||
local node
|
local node
|
||||||
if declare -f -F nvm &> /dev/null; then
|
if declare -f -F nvm &> /dev/null; then
|
||||||
node=$(nvm current 2> /dev/null)
|
node=$(nvm current 2> /dev/null)
|
||||||
[[ "${node}" == "system" ]] && return
|
[[ "${node}" == "system" ]] && return
|
||||||
echo -e "${NVM_THEME_PROMPT_PREFIX}${node}${NVM_THEME_PROMPT_SUFFIX}"
|
echo -e "${NVM_THEME_PROMPT_PREFIX}${node}${NVM_THEME_PROMPT_SUFFIX}"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
function node_version_prompt {
|
function node_version_prompt {
|
||||||
echo -e "$(nvm_version_prompt)"
|
echo -e "$(nvm_version_prompt)"
|
||||||
}
|
}
|
||||||
|
|
||||||
function rvm_version_prompt {
|
function rvm_version_prompt {
|
||||||
if which rvm &> /dev/null; then
|
if which rvm &> /dev/null; then
|
||||||
rvm=$(rvm-prompt) || return
|
rvm=$(rvm-prompt) || return
|
||||||
if [ -n "$rvm" ]; then
|
if [ -n "$rvm" ]; then
|
||||||
echo -e "$RVM_THEME_PROMPT_PREFIX$rvm$RVM_THEME_PROMPT_SUFFIX"
|
echo -e "$RVM_THEME_PROMPT_PREFIX$rvm$RVM_THEME_PROMPT_SUFFIX"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
function rbenv_version_prompt {
|
function rbenv_version_prompt {
|
||||||
if which rbenv &> /dev/null; then
|
if which rbenv &> /dev/null; then
|
||||||
rbenv=$(rbenv version-name) || return
|
rbenv=$(rbenv version-name) || return
|
||||||
$(rbenv commands | grep -q gemset) && gemset=$(rbenv gemset active 2> /dev/null) && rbenv="$rbenv@${gemset%% *}"
|
$rbenv commands | grep -q gemset && gemset=$(rbenv gemset active 2> /dev/null) && rbenv="$rbenv@${gemset%% *}"
|
||||||
if [ $rbenv != "system" ]; then
|
if [ "$rbenv" != "system" ]; then
|
||||||
echo -e "$RBENV_THEME_PROMPT_PREFIX$rbenv$RBENV_THEME_PROMPT_SUFFIX"
|
echo -e "$RBENV_THEME_PROMPT_PREFIX$rbenv$RBENV_THEME_PROMPT_SUFFIX"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
function rbfu_version_prompt {
|
function rbfu_version_prompt {
|
||||||
if [[ $RBFU_RUBY_VERSION ]]; then
|
if [[ $RBFU_RUBY_VERSION ]]; then
|
||||||
echo -e "${RBFU_THEME_PROMPT_PREFIX}${RBFU_RUBY_VERSION}${RBFU_THEME_PROMPT_SUFFIX}"
|
echo -e "${RBFU_THEME_PROMPT_PREFIX}${RBFU_RUBY_VERSION}${RBFU_THEME_PROMPT_SUFFIX}"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
function chruby_version_prompt {
|
function chruby_version_prompt {
|
||||||
if declare -f -F chruby &> /dev/null; then
|
if declare -f -F chruby &> /dev/null; then
|
||||||
if declare -f -F chruby_auto &> /dev/null; then
|
if declare -f -F chruby_auto &> /dev/null; then
|
||||||
chruby_auto
|
chruby_auto
|
||||||
fi
|
fi
|
||||||
|
|
||||||
ruby_version=$(ruby --version | awk '{print $1, $2;}') || return
|
ruby_version=$(ruby --version | awk '{print $1, $2;}') || return
|
||||||
|
|
||||||
if [[ ! $(chruby | grep '\*') ]]; then
|
if ! chruby | grep -q '\*'; then
|
||||||
ruby_version="${ruby_version} (system)"
|
ruby_version="${ruby_version} (system)"
|
||||||
fi
|
fi
|
||||||
echo -e "${CHRUBY_THEME_PROMPT_PREFIX}${ruby_version}${CHRUBY_THEME_PROMPT_SUFFIX}"
|
echo -e "${CHRUBY_THEME_PROMPT_PREFIX}${ruby_version}${CHRUBY_THEME_PROMPT_SUFFIX}"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
function ruby_version_prompt {
|
function ruby_version_prompt {
|
||||||
if [[ "${THEME_SHOW_RUBY_PROMPT}" = "true" ]]; then
|
if [[ "${THEME_SHOW_RUBY_PROMPT}" = "true" ]]; then
|
||||||
echo -e "$(rbfu_version_prompt)$(rbenv_version_prompt)$(rvm_version_prompt)$(chruby_version_prompt)"
|
echo -e "$(rbfu_version_prompt)$(rbenv_version_prompt)$(rvm_version_prompt)$(chruby_version_prompt)"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
function k8s_context_prompt {
|
function k8s_context_prompt {
|
||||||
echo -e "$(kubectl config current-context 2> /dev/null)"
|
echo -e "$(kubectl config current-context 2> /dev/null)"
|
||||||
}
|
}
|
||||||
|
|
||||||
function virtualenv_prompt {
|
function virtualenv_prompt {
|
||||||
if [[ -n "$VIRTUAL_ENV" ]]; then
|
if [[ -n "$VIRTUAL_ENV" ]]; then
|
||||||
virtualenv=`basename "$VIRTUAL_ENV"`
|
virtualenv=$(basename "$VIRTUAL_ENV")
|
||||||
echo -e "$VIRTUALENV_THEME_PROMPT_PREFIX$virtualenv$VIRTUALENV_THEME_PROMPT_SUFFIX"
|
echo -e "$VIRTUALENV_THEME_PROMPT_PREFIX$virtualenv$VIRTUALENV_THEME_PROMPT_SUFFIX"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
function condaenv_prompt {
|
function condaenv_prompt {
|
||||||
if [[ $CONDA_DEFAULT_ENV ]]; then
|
if [[ $CONDA_DEFAULT_ENV ]]; then
|
||||||
echo -e "${CONDAENV_THEME_PROMPT_PREFIX}${CONDA_DEFAULT_ENV}${CONDAENV_THEME_PROMPT_SUFFIX}"
|
echo -e "${CONDAENV_THEME_PROMPT_PREFIX}${CONDA_DEFAULT_ENV}${CONDAENV_THEME_PROMPT_SUFFIX}"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
function py_interp_prompt {
|
function py_interp_prompt {
|
||||||
py_version=$(python --version 2>&1 | awk 'NR==1{print "py-"$2;}') || return
|
py_version=$(python --version 2>&1 | awk 'NR==1{print "py-"$2;}') || return
|
||||||
echo -e "${PYTHON_THEME_PROMPT_PREFIX}${py_version}${PYTHON_THEME_PROMPT_SUFFIX}"
|
echo -e "${PYTHON_THEME_PROMPT_PREFIX}${py_version}${PYTHON_THEME_PROMPT_SUFFIX}"
|
||||||
}
|
}
|
||||||
|
|
||||||
function python_version_prompt {
|
function python_version_prompt {
|
||||||
echo -e "$(virtualenv_prompt)$(condaenv_prompt)$(py_interp_prompt)"
|
echo -e "$(virtualenv_prompt)$(condaenv_prompt)$(py_interp_prompt)"
|
||||||
}
|
}
|
||||||
|
|
||||||
function git_user_info {
|
function git_user_info {
|
||||||
# support two or more initials, set by 'git pair' plugin
|
# support two or more initials, set by 'git pair' plugin
|
||||||
SCM_CURRENT_USER=$(git config user.initials | sed 's% %+%')
|
SCM_CURRENT_USER=$(git config user.initials | sed 's% %+%')
|
||||||
# if `user.initials` weren't set, attempt to extract initials from `user.name`
|
# if `user.initials` weren't set, attempt to extract initials from `user.name`
|
||||||
[[ -z "${SCM_CURRENT_USER}" ]] && SCM_CURRENT_USER=$(printf "%s" $(for word in $(git config user.name | PERLIO=:utf8 perl -pe '$_=lc'); do printf "%s" "${word:0:1}"; done))
|
[[ -z "${SCM_CURRENT_USER}" ]] && SCM_CURRENT_USER=$(printf "%s" "$(for word in $(git config user.name | PERLIO=:utf8 perl -pe '$_=lc'); do printf "%s" "${word:0:1}"; done)")
|
||||||
[[ -n "${SCM_CURRENT_USER}" ]] && printf "%s" "$SCM_THEME_CURRENT_USER_PREFFIX$SCM_CURRENT_USER$SCM_THEME_CURRENT_USER_SUFFIX"
|
[[ -n "${SCM_CURRENT_USER}" ]] && printf "%s" "$SCM_THEME_CURRENT_USER_PREFFIX$SCM_CURRENT_USER$SCM_THEME_CURRENT_USER_SUFFIX"
|
||||||
}
|
}
|
||||||
|
|
||||||
function clock_char {
|
function clock_char {
|
||||||
CLOCK_CHAR=${THEME_CLOCK_CHAR:-"⌚"}
|
CLOCK_CHAR=${THEME_CLOCK_CHAR:-"⌚"}
|
||||||
CLOCK_CHAR_COLOR=${THEME_CLOCK_CHAR_COLOR:-"$normal"}
|
CLOCK_CHAR_COLOR=${THEME_CLOCK_CHAR_COLOR:-"$normal"}
|
||||||
SHOW_CLOCK_CHAR=${THEME_SHOW_CLOCK_CHAR:-"true"}
|
SHOW_CLOCK_CHAR=${THEME_SHOW_CLOCK_CHAR:-"true"}
|
||||||
|
|
||||||
if [[ "${SHOW_CLOCK_CHAR}" = "true" ]]; then
|
if [[ "${SHOW_CLOCK_CHAR}" = "true" ]]; then
|
||||||
echo -e "${CLOCK_CHAR_COLOR}${CLOCK_CHAR_THEME_PROMPT_PREFIX}${CLOCK_CHAR}${CLOCK_CHAR_THEME_PROMPT_SUFFIX}"
|
echo -e "${CLOCK_CHAR_COLOR}${CLOCK_CHAR_THEME_PROMPT_PREFIX}${CLOCK_CHAR}${CLOCK_CHAR_THEME_PROMPT_SUFFIX}"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
function clock_prompt {
|
function clock_prompt {
|
||||||
CLOCK_COLOR=${THEME_CLOCK_COLOR:-"$normal"}
|
CLOCK_COLOR=${THEME_CLOCK_COLOR:-"$normal"}
|
||||||
CLOCK_FORMAT=${THEME_CLOCK_FORMAT:-"%H:%M:%S"}
|
CLOCK_FORMAT=${THEME_CLOCK_FORMAT:-"%H:%M:%S"}
|
||||||
[ -z $THEME_SHOW_CLOCK ] && THEME_SHOW_CLOCK=${THEME_CLOCK_CHECK:-"true"}
|
[ -z "$THEME_SHOW_CLOCK" ] && THEME_SHOW_CLOCK=${THEME_CLOCK_CHECK:-"true"}
|
||||||
SHOW_CLOCK=$THEME_SHOW_CLOCK
|
SHOW_CLOCK=$THEME_SHOW_CLOCK
|
||||||
|
|
||||||
if [[ "${SHOW_CLOCK}" = "true" ]]; then
|
if [[ "${SHOW_CLOCK}" = "true" ]]; then
|
||||||
CLOCK_STRING=$(date +"${CLOCK_FORMAT}")
|
CLOCK_STRING=$(date +"${CLOCK_FORMAT}")
|
||||||
echo -e "${CLOCK_COLOR}${CLOCK_THEME_PROMPT_PREFIX}${CLOCK_STRING}${CLOCK_THEME_PROMPT_SUFFIX}"
|
echo -e "${CLOCK_COLOR}${CLOCK_THEME_PROMPT_PREFIX}${CLOCK_STRING}${CLOCK_THEME_PROMPT_SUFFIX}"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
function user_host_prompt {
|
function user_host_prompt {
|
||||||
if [[ "${THEME_SHOW_USER_HOST}" = "true" ]]; then
|
if [[ "${THEME_SHOW_USER_HOST}" = "true" ]]; then
|
||||||
echo -e "${USER_HOST_THEME_PROMPT_PREFIX}\u@\h${USER_HOST_THEME_PROMPT_SUFFIX}"
|
echo -e "${USER_HOST_THEME_PROMPT_PREFIX}\u@\h${USER_HOST_THEME_PROMPT_SUFFIX}"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
# backwards-compatibility
|
# backwards-compatibility
|
||||||
function git_prompt_info {
|
function git_prompt_info {
|
||||||
_git-hide-status && return
|
_git-hide-status && return
|
||||||
git_prompt_vars
|
git_prompt_vars
|
||||||
echo -e "${SCM_PREFIX}${SCM_BRANCH}${SCM_STATE}${SCM_SUFFIX}"
|
echo -e "${SCM_PREFIX}${SCM_BRANCH}${SCM_STATE}${SCM_SUFFIX}"
|
||||||
}
|
}
|
||||||
|
|
||||||
function p4_prompt_info() {
|
function p4_prompt_info() {
|
||||||
p4_prompt_vars
|
p4_prompt_vars
|
||||||
echo -e "${SCM_PREFIX}${SCM_BRANCH}:${SCM_CHANGE}${SCM_STATE}${SCM_SUFFIX}"
|
echo -e "${SCM_PREFIX}${SCM_BRANCH}:${SCM_CHANGE}${SCM_STATE}${SCM_SUFFIX}"
|
||||||
}
|
}
|
||||||
|
|
||||||
function svn_prompt_info {
|
function svn_prompt_info {
|
||||||
svn_prompt_vars
|
svn_prompt_vars
|
||||||
echo -e "${SCM_PREFIX}${SCM_BRANCH}${SCM_STATE}${SCM_SUFFIX}"
|
echo -e "${SCM_PREFIX}${SCM_BRANCH}${SCM_STATE}${SCM_SUFFIX}"
|
||||||
}
|
}
|
||||||
|
|
||||||
function hg_prompt_info() {
|
function hg_prompt_info() {
|
||||||
hg_prompt_vars
|
hg_prompt_vars
|
||||||
echo -e "${SCM_PREFIX}${SCM_BRANCH}:${SCM_CHANGE#*:}${SCM_STATE}${SCM_SUFFIX}"
|
echo -e "${SCM_PREFIX}${SCM_BRANCH}:${SCM_CHANGE#*:}${SCM_STATE}${SCM_SUFFIX}"
|
||||||
}
|
}
|
||||||
|
|
||||||
function scm_char {
|
function scm_char {
|
||||||
scm_prompt_char
|
scm_prompt_char
|
||||||
echo -e "${SCM_THEME_CHAR_PREFIX}${SCM_CHAR}${SCM_THEME_CHAR_SUFFIX}"
|
echo -e "${SCM_THEME_CHAR_PREFIX}${SCM_CHAR}${SCM_THEME_CHAR_SUFFIX}"
|
||||||
}
|
}
|
||||||
|
|
||||||
function prompt_char {
|
function prompt_char {
|
||||||
scm_char
|
scm_char
|
||||||
}
|
}
|
||||||
|
|
||||||
function battery_char {
|
function battery_char {
|
||||||
if [[ "${THEME_BATTERY_PERCENTAGE_CHECK}" = true ]]; then
|
if [[ "${THEME_BATTERY_PERCENTAGE_CHECK}" = true ]]; then
|
||||||
echo -e "${bold_red}$(battery_percentage)%"
|
echo -e "${bold_red}$(battery_percentage)%"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
if ! _command_exists battery_charge ; then
|
if ! _command_exists battery_charge; then
|
||||||
# if user has installed battery plugin, skip this...
|
# if user has installed battery plugin, skip this...
|
||||||
function battery_charge (){
|
function battery_charge() {
|
||||||
# no op
|
# no op
|
||||||
echo -n
|
echo -n
|
||||||
}
|
}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# The battery_char function depends on the presence of the battery_percentage function.
|
# The battery_char function depends on the presence of the battery_percentage function.
|
||||||
# If battery_percentage is not defined, then define battery_char as a no-op.
|
# If battery_percentage is not defined, then define battery_char as a no-op.
|
||||||
if ! _command_exists battery_percentage ; then
|
if ! _command_exists battery_percentage; then
|
||||||
function battery_char (){
|
function battery_char() {
|
||||||
# no op
|
# no op
|
||||||
echo -n
|
echo -n
|
||||||
}
|
}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
function aws_profile {
|
function aws_profile {
|
||||||
if [[ $AWS_DEFAULT_PROFILE ]]; then
|
if [[ $AWS_DEFAULT_PROFILE ]]; then
|
||||||
echo -e "${AWS_DEFAULT_PROFILE}"
|
echo -e "${AWS_DEFAULT_PROFILE}"
|
||||||
else
|
else
|
||||||
echo -e "default"
|
echo -e "default"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
function __check_precmd_conflict() {
|
function __check_precmd_conflict() {
|
||||||
local f
|
local f
|
||||||
for f in "${precmd_functions[@]}"; do
|
for f in "${precmd_functions[@]}"; do
|
||||||
if [[ "${f}" == "${1}" ]]; then
|
if [[ "${f}" == "${1}" ]]; then
|
||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
return 1
|
return 1
|
||||||
}
|
}
|
||||||
|
|
||||||
function safe_append_prompt_command {
|
function safe_append_prompt_command {
|
||||||
local prompt_re
|
local prompt_re
|
||||||
|
|
||||||
if [ "${__bp_imported}" == "defined" ]; then
|
if [ "${__bp_imported}" == "defined" ]; then
|
||||||
# We are using bash-preexec
|
# We are using bash-preexec
|
||||||
if ! __check_precmd_conflict "${1}" ; then
|
if ! __check_precmd_conflict "${1}"; then
|
||||||
precmd_functions+=("${1}")
|
precmd_functions+=("${1}")
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
# Set OS dependent exact match regular expression
|
# Set OS dependent exact match regular expression
|
||||||
if [[ ${OSTYPE} == darwin* ]]; then
|
if [[ ${OSTYPE} == darwin* ]]; then
|
||||||
# macOS
|
# macOS
|
||||||
prompt_re="[[:<:]]${1}[[:>:]]"
|
prompt_re="[[:<:]]${1}[[:>:]]"
|
||||||
else
|
else
|
||||||
# Linux, FreeBSD, etc.
|
# Linux, FreeBSD, etc.
|
||||||
prompt_re="\<${1}\>"
|
prompt_re="\<${1}\>"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ ${PROMPT_COMMAND} =~ ${prompt_re} ]]; then
|
if [[ ${PROMPT_COMMAND} =~ ${prompt_re} ]]; then
|
||||||
return
|
return
|
||||||
elif [[ -z ${PROMPT_COMMAND} ]]; then
|
elif [[ -z ${PROMPT_COMMAND} ]]; then
|
||||||
PROMPT_COMMAND="${1}"
|
PROMPT_COMMAND="${1}"
|
||||||
else
|
else
|
||||||
PROMPT_COMMAND="${1};${PROMPT_COMMAND}"
|
PROMPT_COMMAND="${1};${PROMPT_COMMAND}"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
function _save-and-reload-history() {
|
function _save-and-reload-history() {
|
||||||
local autosave=${1:-0}
|
local autosave=${1:-0}
|
||||||
[[ $autosave -eq 1 ]] && history -a && history -c && history -r
|
[[ $autosave -eq 1 ]] && history -a && history -c && history -r
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue