diff options
| -rw-r--r-- | color-test | 19 | ||||
| -rwxr-xr-x | git-prompt.sh | 20 | ||||
| -rw-r--r-- | upstream-remote | 1 |
3 files changed, 32 insertions, 8 deletions
diff --git a/color-test b/color-test new file mode 100644 index 0000000..4f30a0e --- /dev/null +++ b/color-test @@ -0,0 +1,19 @@ +#!/bin/bash +reset=`tput sgr0` +c=`tput sgr0; tput setaf 0`;echo "-black-${c}testTEST${reset}" +c=`tput sgr0; tput setaf 1`;echo "-red-${c}testTEST${reset}" +c=`tput sgr0; tput setaf 2`;echo "-green-${c}testTEST${reset}" +c=`tput sgr0; tput setaf 3`;echo "-yellow-${c}testTEST${reset}" +c=`tput sgr0; tput setaf 4`;echo "-blue-${c}testTEST${reset}" +c=`tput sgr0; tput setaf 5`;echo "-magenta-${c}testTEST${reset}" +c=`tput sgr0; tput setaf 6`;echo "-cyan-${c}testTEST${reset}" +c=`tput sgr0; tput setaf 7`;echo "-white-${c}testTEST${reset}" + +c=`tput setaf 0; tput bold`;echo "-BLACK-${c}testTEST${reset}" +c=`tput setaf 1; tput bold`;echo "-RED-${c}testTEST${reset}" +c=`tput setaf 2; tput bold`;echo "-GREEN-${c}testTEST${reset}" +c=`tput setaf 3; tput bold`;echo "-YELLOW-${c}testTEST${reset}" +c=`tput setaf 4; tput bold`;echo "-BLUE-${c}testTEST${reset}" +c=`tput setaf 5; tput bold`;echo "-MAGENTA-${c}testTEST${reset}" +c=`tput setaf 6; tput bold` # why 14 doesn't work?;echo "-CYAN-${c}testTEST${reset}" +c=`tput setaf 7; tput bold`;echo "-WHITE-${c}testTEST${reset}" diff --git a/git-prompt.sh b/git-prompt.sh index c262f9c..0685d66 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 @@ -30,6 +30,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 @@ -267,6 +269,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} @@ -303,11 +307,11 @@ set_shell_label() { #################################################################### WHO_WHERE # [[user@]host[-tty]] - - if [[ -n $id || -n $host ]] ; then + + if [[ -n $id || -n $host || -n $special_env ]] ; then [[ -n $id && -n $host ]] && at='@' || at='' - color_who_where="${id}${host:+$host_color$at$host}${tty:+ $tty}" - plain_who_where="${id}$at$host" + color_who_where="${special_env:+($special_env) }${id}${host:+$host_color$at$host}${tty:+ $tty}" + plain_who_where="${special_env:+($special_env) }${id}$at$host" # add trailing " " color_who_where="$color_who_where " @@ -411,7 +415,7 @@ parse_git_status() { [[ -n ${git_dir/./} ]] || return 1 vcs=git - parse_git_complete + #parse_git_complete ########################################################## GIT STATUS file_regex='\([^/]*\/\?\).*' @@ -639,7 +643,7 @@ prompt_command_function() { if [[ "$rc" == "0" ]]; then rc="" else - rc="$rc_color$rc$colors_reset$bell " + rc="$rc_color($rc)$colors_reset$bell " fi cwd=${PWD/$HOME/\~} # substitute "~" @@ -656,7 +660,7 @@ 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$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 } diff --git a/upstream-remote b/upstream-remote new file mode 100644 index 0000000..41d86c0 --- /dev/null +++ b/upstream-remote @@ -0,0 +1 @@ +origin git://github.com/lvv/git-prompt.git |