Fix issue where super prompt would fail to delete text due to borked non-printing characters.
This commit is contained in:
parent
5297c7a7e9
commit
2fa5caec8a
2 changed files with 16 additions and 46 deletions
|
@ -5,38 +5,26 @@
|
|||
src_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||
source $src_dir/colorize.sh
|
||||
|
||||
function sp_git_info {
|
||||
function sp_git {
|
||||
# Get the current branch name
|
||||
local git_branch=$(git branch 2>/dev/null | grep "*" | cut -d ' ' -f 2) || ""
|
||||
|
||||
# If we're in a git repo, add the repo (i.e. top-level directory) name, parens, and a newline
|
||||
# If we're in a git repo, add the repo (i.e. top-level directory) name, and parens
|
||||
if [ "$git_branch" != "" ]; then
|
||||
local git_repo=$(git rev-parse --show-toplevel)
|
||||
git_branch=\($(colorize magenta ${git_repo//*\/})"|"$(colorize magenta ${git_branch})\)
|
||||
printf "%s\n" "$git_branch"
|
||||
else
|
||||
printf ""
|
||||
git_repo=${git_repo//*\/}
|
||||
echo "(${git_repo}|${git_branch})"
|
||||
fi
|
||||
}
|
||||
|
||||
function sp_path {
|
||||
local git_dir=$(git rev-parse --show-toplevel 2>/dev/null)
|
||||
if [ "$git_dir" != "" ]; then
|
||||
local path=$(colorize green ${PWD//$git_dir/\!})
|
||||
local path=${PWD//$git_dir/\!}
|
||||
else
|
||||
local path=$(colorize green ${PWD//$HOME/\~})
|
||||
local path=${PWD//$HOME/\~}
|
||||
fi
|
||||
|
||||
printf $path
|
||||
echo $path
|
||||
}
|
||||
|
||||
function super_prompt {
|
||||
local user=$(colorize yellow $(whoami))
|
||||
local host=$(colorize blue ${HOSTNAME})
|
||||
local prompt_char=$(colorize red '$')
|
||||
|
||||
sp_git_info
|
||||
printf "[%s@%s:%s]\n%s " "$user" "$host" "$(sp_path)" "$prompt_char"
|
||||
}
|
||||
|
||||
export PS1="\$(super_prompt)"
|
||||
export PS1="[${C_YELLOW}\u${C_NO}@${C_BLUE}${HOSTNAME}${C_NO}:${C_GREEN}\$(sp_path)${C_NO}] ${C_MAGENTA}\$(sp_git)${C_NO}\n${C_RED}\$ ${C_NO}"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue