From ca52b6ccdf1306079a060f06795d404962c99e19 Mon Sep 17 00:00:00 2001 From: Michael Allen Date: Fri, 14 Aug 2015 20:00:40 +0100 Subject: 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. --- prompt | 21 --------------------- prompt.bash | 18 ++++++++++++++++++ prompt.zsh | 12 ++++++++++++ 3 files changed, 30 insertions(+), 21 deletions(-) delete mode 100755 prompt create mode 100755 prompt.bash create mode 100755 prompt.zsh diff --git a/prompt b/prompt deleted file mode 100755 index 6d5c71d..0000000 --- a/prompt +++ /dev/null @@ -1,21 +0,0 @@ -dot="$(cd "$(dirname "$0")"; pwd)" -source "$dot/git-base.sh" - -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 -fi - -if [[ "$command" == "--bash" || "$command" == "" ]]; then - git_prefix="\033[1;30mgit:(\033[0m" - git_suffix="\033[1;30m)\033[0m" - echo "$git_prefix$(bash_color_remote_commits;readable_branch_name;bash_color_local_commits)$git_suffix$(bash_color_changes_status)" -fi diff --git a/prompt.bash b/prompt.bash new file mode 100755 index 0000000..37a0295 --- /dev/null +++ b/prompt.bash @@ -0,0 +1,18 @@ +#! /usr/bin/env bash + +dot="$(cd "$(dirname "$0")"; pwd)" +source "$dot/git-base.sh" + +command="$1" + +if [[ "$command" == "--zsh" ]]; then + git_prefix="%{$fg_bold[black]%}git:(%{$reset_color}" + git_suffix="%{$fg_bold[black]%})%{$reset_color}" + 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 + git_prefix="\033[1;30mgit:(\033[0m" + git_suffix="\033[1;30m)\033[0m" + echo "$git_prefix$(bash_color_remote_commits;readable_branch_name;bash_color_local_commits)$git_suffix$(bash_color_changes_status)" +fi 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" +#$(zsh_color_remote_commits;branch_name;zsh_color_local_commits)$git_suffix$(zsh_color_changes_status)" -- cgit v1.2.3