From 3664bb3f711796f566d772de7a17a696cdfe430b Mon Sep 17 00:00:00 2001 From: Nick Chambers Date: Mon, 24 Oct 2022 19:24:06 -0500 Subject: [PATCH] Use correct variable names for colors --- dotlib/generic-pre/prompt.sh | 41 ++++++------------------------------ 1 file changed, 7 insertions(+), 34 deletions(-) diff --git a/dotlib/generic-pre/prompt.sh b/dotlib/generic-pre/prompt.sh index 6cee9fa..1c97256 100644 --- a/dotlib/generic-pre/prompt.sh +++ b/dotlib/generic-pre/prompt.sh @@ -1,5 +1,5 @@ setup-prompt() { - local last_res=$? color=$PS1_color_green + local last_res=$? color=$PS1_color_success PS1="\w " if [[ -d .git ]]; then @@ -11,43 +11,16 @@ setup-prompt() { fi if (( last_res )); then - color=$PS1_color_red + color=$PS1_color_fail fi PS1+="\[$color\][$last_res]\[$PS1_color_reset\] $PS1_prompt_sym " } -PS1_prompt_sym=λ -PS1_hostname=${HOSTNAME-"$(hostname)"} -PS1_color_red=$(tput setaf 1) -PS1_color_green=$(tput setaf 2) -PS1_color_reset=$(tput sgr0) PROMPT_COMMAND+=(setup-prompt) -read -r month day < <(date "+%m %d") - -if (( 10#$month == 3 && 10#$day < 18 )); then - if (( 17 - 10#$day == 0 )); then - printf "Happy Saint Patrick's day!\n" - else - printf "Only %d days left until Saint Patrick's day!\n" "$(( 17 - 10#$day ))" - fi - - PS1_prompt_sym=🍀 -elif (( 10#$month == 10 )); then - if (( 31 - 10#$day == 0 )); then - printf 'Have a spooky halloween!\n' - else - printf 'Only %d days left until Halloween!\n' "$(( 31 - 10#$day ))" - fi - - PS1_prompt_sym=🎃 -elif (( 10#$month == 12 && 10#$day < 26 )); then - if (( 25 - 10#$day == 0 )); then - printf 'Merry Christmas!\n' - else - printf 'Only %d days left until Christmas!\n' "$(( 25 - 10#$day ))" - fi - - PS1_prompt_sym=🌲 -fi +PS1_prompt_sym=λ +PS1_hostname=${HOSTNAME-"$(hostname)"} +PS1_color_fail=$(tput setaf 1) +PS1_color_success=$(tput setaf 2) +PS1_color_reset=$(tput sgr0)