diff options
| author | Gianni Ceccarelli <gianni.ceccarelli@net-a-porter.com> | 2010-03-15 10:59:21 +0000 |
|---|---|---|
| committer | Gianni Ceccarelli <gianni.ceccarelli@net-a-porter.com> | 2010-03-15 10:59:21 +0000 |
| commit | 3b4af8e928797588289299397ff83cf38f992f0a (patch) | |
| tree | 079a87463ae6640e1c724b3422cc4904555e5f34 | |
| parent | fixed: for case when there is no VCS modules (diff) | |
| download | git-prompt-3b4af8e928797588289299397ff83cf38f992f0a.tar.gz git-prompt-3b4af8e928797588289299397ff83cf38f992f0a.tar.bz2 git-prompt-3b4af8e928797588289299397ff83cf38f992f0a.zip | |
my mods
| -rwxr-xr-x | git-prompt.sh | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/git-prompt.sh b/git-prompt.sh index 3c444f6..c59195f 100755 --- a/git-prompt.sh +++ b/git-prompt.sh @@ -6,7 +6,7 @@ ##### read config file if any. - unset dir_color rc_color user_id_color root_id_color init_vcs_color clean_vcs_color + unset dir_color rc_color jobs_color prompt_color user_id_color root_id_color init_vcs_color clean_vcs_color unset modified_vcs_color added_vcs_color addmoded_vcs_color untracked_vcs_color op_vcs_color detached_vcs_color conf=git-prompt.conf; [[ -r $conf ]] && . $conf @@ -29,6 +29,8 @@ if [[ -n "$cols" && $cols -ge 8 ]]; then # if terminal supports colors dir_color=${dir_color:-CYAN} rc_color=${rc_color:-red} + jobs_color=${jobs_color:-cyan} + prompt_color=${prompt_color:-CYAN} user_id_color=${user_id_color:-blue} root_id_color=${root_id_color:-magenta} else # only B/W @@ -266,6 +268,8 @@ set_shell_label() { dir_color=${!dir_color} rc_color=${!rc_color} + prompt_color=${!prompt_color} + jobs_color=${!jobs_color} user_id_color=${!user_id_color} root_id_color=${!root_id_color} @@ -611,12 +615,8 @@ alias jumpstart='echo ${aj_dir_list[@]}' prompt_command_function() { rc="$?" - - if [[ "$rc" == "0" ]]; then - rc="" - else - rc="$rc_color$rc$colors_reset$bell " - fi + rc="$rc_color($rc)$colors_reset" + jobs="$jobs_color[\j]$jobs_color" cwd=${PWD/$HOME/\~} # substitute "~" set_shell_label "${cwd##[/~]*/}/" # default label - path last dir @@ -632,8 +632,8 @@ prompt_command_function() { # else eval cwd_cmd, cwd should have path after exection eval "${cwd_cmd/\\/cwd=\\\\}" - PS1="$colors_reset$rc$head_local$color_who_where$dir_color$cwd$tail_local$dir_color$prompt_char $colors_reset" - + #PS1="$colors_reset$rc$jobs$head_local$color_who_where$dir_color$cwd$tail_local$dir_color$prompt_char $colors_reset" + PS1="$color_who_where$dir_color$cwd $head_local\n$colors_reset$rc$jobs$prompt_color$prompt_char $colors_reset" unset head_local tail_local pwd } |