summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Allen <michael@michaelallen.io>2015-08-14 20:00:40 +0100
committerMichael Allen <michael@michaelallen.io>2015-08-14 20:00:43 +0100
commitca52b6ccdf1306079a060f06795d404962c99e19 (patch)
treef7fcdcc2384fe5a8926373c2a8e497d873b4edf8
parent253e0090fb62f0a130c48e1f965749827db213ab (diff)
downloadgit-sonar-ca52b6ccdf1306079a060f06795d404962c99e19.tar.gz
git-sonar-ca52b6ccdf1306079a060f06795d404962c99e19.zip
Split prompt command into bash and zsh
The shebang in the top of a file dictates it's runtime. To load the zsh colors stuff you need to be executing in Zsh but then I couldn't support bash so I've split the prompt file into one for each.
Diffstat (limited to '')
-rwxr-xr-xprompt.bash (renamed from prompt)9
-rwxr-xr-xprompt.zsh12
2 files changed, 15 insertions, 6 deletions
diff --git a/prompt b/prompt.bash
index 6d5c71d..37a0295 100755
--- a/prompt
+++ b/prompt.bash
@@ -1,3 +1,5 @@
+#! /usr/bin/env bash
+
dot="$(cd "$(dirname "$0")"; pwd)"
source "$dot/git-base.sh"
@@ -6,12 +8,7 @@ command="$1"
if [[ "$command" == "--zsh" ]]; then
git_prefix="%{$fg_bold[black]%}git:(%{$reset_color}"
git_suffix="%{$fg_bold[black]%})%{$reset_color}"
- printf '%s' $git_prefix
- zsh_color_remote_commits
- branch_name
- zsh_color_local_commits
- printf '%s' $git_suffix
- zsh_color_changes_status
+ printf '%q' "$git_prefix$(zsh_color_remote_commits;branch_name;zsh_color_local_commits)$git_suffix$(zsh_color_changes_status)"
fi
if [[ "$command" == "--bash" || "$command" == "" ]]; then
diff --git a/prompt.zsh b/prompt.zsh
new file mode 100755
index 0000000..34e5bd2
--- /dev/null
+++ b/prompt.zsh
@@ -0,0 +1,12 @@
+#! /usr/bin/env zsh
+
+dot="$(cd "$(dirname "$0")"; pwd)"
+source "$dot/git-base.sh"
+autoload colors && colors
+
+command="$1"
+
+git_prefix="%{$fg_bold[black]%}git:(%{$reset_color}"
+git_suffix="%{$fg_bold[black]%})%{$reset_color}"
+printf '%s' " $git_prefix"
+#<Down>$(zsh_color_remote_commits;branch_name;zsh_color_local_commits)$git_suffix$(zsh_color_changes_status)"