diff options
| -rwxr-xr-x | prompt.bash | 8 | ||||
| -rwxr-xr-x | radar-base.sh | 24 | ||||
| -rwxr-xr-x | test-commits.sh | 6 |
3 files changed, 19 insertions, 19 deletions
diff --git a/prompt.bash b/prompt.bash index 4ceaf22..4821319 100755 --- a/prompt.bash +++ b/prompt.bash @@ -4,12 +4,12 @@ dot="$(cd "$(dirname "$0")"; pwd)" source "$dot/radar-base.sh" if is_repo; then - printf " \[\033[1;30m\]git:(\[\033[0m\]" + printf " \x01\033[1;30m\x02git:(\x01\033[0m\x02" bash_color_remote_commits - printf "\[\033[0;37m\]" + printf "\x01\033[0;37m\x02" readable_branch_name - printf "\[\033[0m\]" + printf "\x01\033[0m\x02" bash_color_local_commits - printf "\[\033[1;30m\])\[\033[0m\]" + printf "\x01\033[1;30m\x02)\x01\033[0m\x02" bash_color_changes_status fi diff --git a/radar-base.sh b/radar-base.sh index 1bbefbd..b7074d8 100755 --- a/radar-base.sh +++ b/radar-base.sh @@ -305,11 +305,11 @@ bash_color_changes_status() { local changes="" if [[ -n "$porcelain" ]]; then - local green_staged_prefix="\[\033[1;32m\]" - local red_unstaged_prefix="\[\033[1;31m\]" - local yellow_conflicted_prefix="\[\033[1;33m\]" - local grey_untracked_prefix="\[\033[1;37m\]" - local reset_suffix="\[\033[0m\]" + local green_staged_prefix="\x01\033[1;32m\x02" + local red_unstaged_prefix="\x01\033[1;31m\x02" + local yellow_conflicted_prefix="\x01\033[1;33m\x02" + local grey_untracked_prefix="\x01\033[1;37m\x02" + local reset_suffix="\x01\033[0m\x02" local staged_changes="$(staged_status "$porcelain" "$green_staged_prefix" "$reset_suffix")" local unstaged_changes="$(unstaged_status "$porcelain" "$red_unstaged_prefix" "$reset_suffix")" @@ -377,9 +377,9 @@ zsh_color_changes_status() { bash_color_local_commits() { local separator="${1:- }" - local green_ahead_arrow="\[\033[1;32m\]↑\[\033[0m\]" - local red_behind_arrow="\[\033[1;31m\]↓\[\033[0m\]" - local yellow_diverged_arrow="\[\033[1;33m\]⇵\[\033[0m\]" + local green_ahead_arrow="\x01\033[1;32m\x02↑\x01\033[0m\x02" + local red_behind_arrow="\x01\033[1;31m\x02↓\x01\033[0m\x02" + local yellow_diverged_arrow="\x01\033[1;33m\x02⇵\x01\033[0m\x02" local local_commits="" if remote_branch="$(remote_branch_name)"; then @@ -422,10 +422,10 @@ zsh_color_local_commits() { bash_color_remote_commits() { local remote_master="\xF0\x9D\x98\xAE" # an italic m to represent master - local green_ahead_arrow="\[\033[1;32m\]←\[\033[0m\]" - local red_behind_arrow="\[\033[1;31m\]→\[\033[0m\]" - local yellow_diverged_arrow="\[\033[1;33m\]⇄\[\033[0m\]" - local not_upstream="\[\033[1;31m\]⚡\[\033[0m\]" + local green_ahead_arrow="\x01\033[1;32m\x02←\x01\033[0m\x02" + local red_behind_arrow="\x01\033[1;31m\x02→\x01\033[0m\x02" + local yellow_diverged_arrow="\x01\033[1;33m\x02⇄\x01\033[0m\x02" + local not_upstream="\x01\033[1;31m\x02⚡\x01\033[0m\x02" if remote_branch="$(remote_branch_name)"; then remote_ahead="$(remote_ahead_of_master "$remote_branch")" diff --git a/test-commits.sh b/test-commits.sh index 0cca0e5..95addf9 100755 --- a/test-commits.sh +++ b/test-commits.sh @@ -374,9 +374,9 @@ test_zsh_and_bash_local_commits() { local zsh_both="%{[yellow]%}⇵%{%}" local zsh_down="%{[red]%}↓%{%}" - printf -v bash_up "\033[1;32m↑\033[0m" - printf -v bash_both "\033[1;33m⇵\033[0m" - printf -v bash_down "\033[1;31m↓\033[0m" + printf -v bash_up "\x01\033[1;32m\x02↑\x01\033[0m\x02" + printf -v bash_both "\x01\033[1;33m\x02⇵\x01\033[0m\x02" + printf -v bash_down "\x01\033[1;31m\x02↓\x01\033[0m\x02" cd_to_tmp "remote" |