From 637b5d5534469ebb15826139e1b3df12a1cc9309 Mon Sep 17 00:00:00 2001 From: Reinaldo Colina Date: Thu, 27 Aug 2015 12:14:13 -0700 Subject: issue-17: Add arguments to make the prompt shorter --- prompt.bash | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'prompt.bash') diff --git a/prompt.bash b/prompt.bash index a3fe420..1e79cd9 100755 --- a/prompt.bash +++ b/prompt.bash @@ -1,11 +1,18 @@ #! /usr/bin/env bash dot="$(cd "$(dirname "$0")"; pwd)" +git_label="" +args=$@ source "$dot/radar-base.sh" if is_repo; then - printf " \x01\033[1;30m\x02git:(\x01\033[0m\x02" - bash_color_remote_commits + if show_git_label $args; then + git_label="git:" + fi + printf " \x01\033[1;30m\x02$git_label(\x01\033[0m\x02" + if show_remote_status $args; then + bash_color_remote_commits + fi readable_branch_name bash_color_local_commits printf "\x01\033[1;30m\x02)\x01\033[0m\x02" -- cgit v1.2.3 From 93dad96832a59d3d7f6ac6580cabf0202b387ffe Mon Sep 17 00:00:00 2001 From: Reinaldo Colina Date: Fri, 28 Aug 2015 13:55:37 -0700 Subject: Removing --minimal arg implementation - Dealing with the git: prefix will be done in a separate pull request - The new --no-remote-status arg remains --- prompt.bash | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'prompt.bash') diff --git a/prompt.bash b/prompt.bash index 1e79cd9..429c88d 100755 --- a/prompt.bash +++ b/prompt.bash @@ -1,15 +1,11 @@ #! /usr/bin/env bash dot="$(cd "$(dirname "$0")"; pwd)" -git_label="" args=$@ source "$dot/radar-base.sh" if is_repo; then - if show_git_label $args; then - git_label="git:" - fi - printf " \x01\033[1;30m\x02$git_label(\x01\033[0m\x02" + printf " \x01\033[1;30m\x02git:(\x01\033[0m\x02" if show_remote_status $args; then bash_color_remote_commits fi -- cgit v1.2.3 From 18a19fc516400f2f8db8925b599b70037ac04403 Mon Sep 17 00:00:00 2001 From: Michael Allen Date: Sun, 30 Aug 2015 14:58:52 +0100 Subject: Duplicate Zsh color config for bash --- prompt.bash | 1 + 1 file changed, 1 insertion(+) (limited to 'prompt.bash') diff --git a/prompt.bash b/prompt.bash index 429c88d..604d8e1 100755 --- a/prompt.bash +++ b/prompt.bash @@ -5,6 +5,7 @@ args=$@ source "$dot/radar-base.sh" if is_repo; then + prepare_bash_colors printf " \x01\033[1;30m\x02git:(\x01\033[0m\x02" if show_remote_status $args; then bash_color_remote_commits -- cgit v1.2.3 From 3884b1fdf423f4e8655dd47bef0ccb2ebdd68c6d Mon Sep 17 00:00:00 2001 From: Michael Allen Date: Sat, 5 Sep 2015 10:50:47 +0100 Subject: Fix colour issue for zsh --- prompt.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'prompt.bash') diff --git a/prompt.bash b/prompt.bash index 604d8e1..264ea7b 100755 --- a/prompt.bash +++ b/prompt.bash @@ -10,7 +10,7 @@ if is_repo; then if show_remote_status $args; then bash_color_remote_commits fi - readable_branch_name + bash_readable_branch_name bash_color_local_commits printf "\x01\033[1;30m\x02)\x01\033[0m\x02" bash_color_changes_status -- cgit v1.2.3 From eb9c08b9b0e05ca2aaf958e34979f6ae58af4e61 Mon Sep 17 00:00:00 2001 From: Michael Allen Date: Wed, 16 Sep 2015 15:25:54 +0100 Subject: switch prompt files to use new shared render functions --- prompt.bash | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'prompt.bash') diff --git a/prompt.bash b/prompt.bash index 264ea7b..51c4db7 100755 --- a/prompt.bash +++ b/prompt.bash @@ -8,10 +8,10 @@ if is_repo; then prepare_bash_colors printf " \x01\033[1;30m\x02git:(\x01\033[0m\x02" if show_remote_status $args; then - bash_color_remote_commits + color_remote_commits fi - bash_readable_branch_name - bash_color_local_commits + readable_branch_name + color_local_commits printf "\x01\033[1;30m\x02)\x01\033[0m\x02" - bash_color_changes_status + color_changes_status fi -- cgit v1.2.3