Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow configuration of the sed command to be used. #32

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow configuration of the sed command to be used. #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions git-prompt.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,13 @@
## cwd_cmd='\W' # display only last dir of path
## cwd_cmd='cwd_truncate 40' # display only last N chars of path

########################################################### SED COMMAND

# The default sed command on OS/X doesn't handle the sed commands used.
# Install gnu-sed instead (brew install gnu-sed) and replace the sed command.
# sed_cmd='sed'
## sed_cmd='gsed'

########################################################### ETC

# Some don't like hostname in uppercase
Expand Down
17 changes: 9 additions & 8 deletions git-prompt.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
virtualenv_module=${virtualenv_module:-on}
error_bell=${error_bell:-off}
cwd_cmd=${cwd_cmd:-\\w}
sed_cmd=${sed_cmd:-sed}


#### dir, rc, root color
Expand Down Expand Up @@ -195,7 +196,7 @@ cwd_truncate() {
# split path into: head='~/', truncateble middle, last_dir

local cwd_max_length=$1

if [[ "$cwd" =~ '(~?/)(.*/)([^/]*)$' ]] ; then # only valid if path have more than 1 dir
local path_head=${BASH_REMATCH[1]}
local path_middle=${BASH_REMATCH[2]}
Expand Down Expand Up @@ -268,8 +269,8 @@ set_shell_label() {

########################################################### TTY
tty=`tty`
tty=`echo $tty | sed "s:/dev/pts/:p:; s:/dev/tty::" ` # RH tty devs
tty=`echo $tty | sed "s:/dev/vc/:vc:" ` # gentoo tty devs
tty=`echo $tty | $sed_cmd "s:/dev/pts/:p:; s:/dev/tty::" ` # RH tty devs
tty=`echo $tty | $sed_cmd "s:/dev/vc/:vc:" ` # gentoo tty devs

if [[ "$TERM" = "screen" ]] ; then

Expand Down Expand Up @@ -361,7 +362,7 @@ parse_svn_status() {
### get rev
eval `
svn info |
sed -n "
$sed_cmd -n "
s@^URL[^/]*//@repo_dir=@p
s/^Revision: /rev=/p
"
Expand All @@ -370,7 +371,7 @@ parse_svn_status() {

unset status modified added clean init added mixed untracked op detached
eval `svn status 2>/dev/null |
sed -n '
$sed_cmd -n '
s/^A... \([^.].*\)/modified=modified; modified_files[${#modified_files[@]}]=\"\1\";/p
s/^M... \([^.].*\)/modified=modified; modified_files[${#modified_files[@]}]=\"\1\";/p
s/^\?... \([^.].*\)/untracked=untracked; untracked_files[${#untracked_files[@]}]=\"\1\";/p
Expand All @@ -393,7 +394,7 @@ parse_hg_status() {
unset status modified added clean init added mixed untracked op detached

eval `hg status 2>/dev/null |
sed -n '
$sed_cmd -n '
s/^M \([^.].*\)/modified=modified; modified_files[${#modified_files[@]}]=\"\1\";/p
s/^A \([^.].*\)/added=added; added_files[${#added_files[@]}]=\"\1\";/p
s/^R \([^.].*\)/added=added;/p
Expand Down Expand Up @@ -440,7 +441,7 @@ parse_git_status() {
# info not in porcelain status
eval " $(
LANG=C git status 2>/dev/null |
sed -n '
$sed_cmd -n '
s/^\(# \)*On branch /branch=/p
s/^nothing to commi.*/clean=clean/p
s/^\(# \)*Initial commi.*/init=init/p
Expand All @@ -463,7 +464,7 @@ parse_git_status() {

eval " $(
LANG=C git status --porcelain 2>/dev/null |
sed -n '
$sed_cmd -n '
s,^[MARC]. \([^\"][^/]*/\?\).*, added=added; [[ \" ${added_files[@]} \" =~ \" \1 \" ]] || added_files[${#added_files[@]}]=\"\1\",p
s,^[MARC]. \"\([^/]\+/\?\).*\"$, added=added; [[ \" ${added_files[@]} \" =~ \" \1 \" ]] || added_files[${#added_files[@]}]=\"\1\",p
s,^.[MAU] \([^\"][^/]*/\?\).*, modified=modified; [[ \" ${modified_files[@]} \" =~ \" \1 \" ]] || modified_files[${#modified_files[@]}]=\"\1\",p
Expand Down