From 27ebc585bed9c755b077ae7ad648591a23f34d9e Mon Sep 17 00:00:00 2001 From: John D Pell Date: Sat, 18 Sep 2021 22:50:24 -0700 Subject: [PATCH] theme/brunton: SC2154 Handle all unbound parameters, even colors! --- themes/brunton/brunton.theme.bash | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/themes/brunton/brunton.theme.bash b/themes/brunton/brunton.theme.bash index 166fcc84f8..04dcbb3e4d 100644 --- a/themes/brunton/brunton.theme.bash +++ b/themes/brunton/brunton.theme.bash @@ -1,28 +1,31 @@ # shellcheck shell=bash # shellcheck disable=SC2034 # Expected behavior for themes. -# shellcheck disable=SC2154 #TODO: fix these all. SCM_THEME_PROMPT_PREFIX="" SCM_THEME_PROMPT_SUFFIX="" -SCM_THEME_PROMPT_DIRTY=" ${bold_red}✗${normal}" -SCM_THEME_PROMPT_CLEAN=" ${bold_green}✓${normal}" -SCM_GIT_CHAR="${bold_green}±${normal}" -SCM_SVN_CHAR="${bold_cyan}⑆${normal}" -SCM_HG_CHAR="${bold_red}☿${normal}" +SCM_THEME_PROMPT_DIRTY=" ${bold_red?}✗${normal?}" +SCM_THEME_PROMPT_CLEAN=" ${bold_green?}✓${normal?}" +SCM_GIT_CHAR="${bold_green?}±${normal?}" +SCM_SVN_CHAR="${bold_cyan?}⑆${normal?}" +SCM_HG_CHAR="${bold_red?}☿${normal?}" -is_vim_shell() { - if [ -n "$VIMRUNTIME" ]; then - echo "[${cyan}vim shell${normal}]" +function is_vim_shell() { + if [[ -n "${VIMRUNTIME:-}" ]]; then + echo "[${cyan?}vim shell${normal?}]" fi } -prompt() { - SCM_PROMPT_FORMAT=' %s (%s)' - PS1="${white}${background_blue} \u${normal}${background_blue}@${red}${background_blue}\h $(clock_prompt) ${reset_color}${normal} $(battery_charge)\n${bold_black}${background_white} \w ${normal}$(scm_prompt)$(is_vim_shell)\n${white}>${normal} " +function prompt() { + local SCM_PROMPT_FORMAT=' %s (%s)' clock_prompt battery_charge scm_prompt is_vim_shell + clock_prompt="$(clock_prompt)" + battery_charge="$(battery_charge)" + scm_prompt="$(scm_prompt)" + is_vim_shell="$(is_vim_shell)" + PS1="${white?}${background_blue?} \u${normal?}${background_blue?}@${red?}${background_blue?}\h ${clock_prompt} ${reset_color?}${normal?} ${battery_charge}\n${bold_black?}${background_white?} \w ${normal?}${scm_prompt}${is_vim_shell}\n${white?}>${normal?} " } -THEME_CLOCK_COLOR=${THEME_CLOCK_COLOR:-"$blue$background_white"} -THEME_CLOCK_FORMAT=${THEME_CLOCK_FORMAT:-" %H:%M:%S"} +: "${THEME_CLOCK_COLOR:=${blue?}${background_white?}}" +: "${THEME_CLOCK_FORMAT:=" %H:%M:%S"}" safe_append_prompt_command prompt