From c3233570674abe2dd38ff86c97dec7a01e033581 Mon Sep 17 00:00:00 2001
From: John D Pell <John+git@gaelicWizard.net>
Date: Sat, 18 Sep 2021 23:09:39 -0700
Subject: [PATCH] theme/purity: SC2154

Handle all unbound parameters, even colors!
---
 themes/purity/purity.theme.bash | 46 +++++++++++++++++++--------------
 1 file changed, 27 insertions(+), 19 deletions(-)

diff --git a/themes/purity/purity.theme.bash b/themes/purity/purity.theme.bash
index 22a3fbfb..0fc6c4cf 100644
--- a/themes/purity/purity.theme.bash
+++ b/themes/purity/purity.theme.bash
@@ -1,36 +1,44 @@
 # shellcheck shell=bash
 # shellcheck disable=SC2034 # Expected behavior for themes.
-# shellcheck disable=SC2154 #TODO: fix these all.
 
-SCM_THEME_PROMPT_DIRTY=" ${bold_red}⊘${normal}"
-SCM_THEME_PROMPT_CLEAN=" ${bold_green}✓${normal}"
-SCM_THEME_PROMPT_PREFIX="${reset_color}( "
-SCM_THEME_PROMPT_SUFFIX=" ${reset_color})"
+SCM_THEME_PROMPT_DIRTY=" ${bold_red?}⊘${normal?}"
+SCM_THEME_PROMPT_CLEAN=" ${bold_green?}✓${normal?}"
+SCM_THEME_PROMPT_PREFIX="${reset_color?}( "
+SCM_THEME_PROMPT_SUFFIX=" ${reset_color?})"
 
-GIT_THEME_PROMPT_DIRTY=" ${bold_red}⊘${normal}"
-GIT_THEME_PROMPT_CLEAN=" ${bold_green}✓${normal}"
-GIT_THEME_PROMPT_PREFIX="${reset_color}( "
-GIT_THEME_PROMPT_SUFFIX=" ${reset_color})"
+GIT_THEME_PROMPT_DIRTY=" ${bold_red?}⊘${normal?}"
+GIT_THEME_PROMPT_CLEAN=" ${bold_green?}✓${normal?}"
+GIT_THEME_PROMPT_PREFIX="${reset_color?}( "
+GIT_THEME_PROMPT_SUFFIX=" ${reset_color?})"
 
-STATUS_THEME_PROMPT_BAD="${bold_red}❯${reset_color}${normal} "
-STATUS_THEME_PROMPT_OK="${bold_green}❯${reset_color}${normal} "
-PURITY_THEME_PROMPT_COLOR="${PURITY_THEME_PROMPT_COLOR:=$blue}"
+STATUS_THEME_PROMPT_BAD="${bold_red?}❯${reset_color?}${normal?} "
+STATUS_THEME_PROMPT_OK="${bold_green?}❯${reset_color?}${normal?} "
+: "${PURITY_THEME_PROMPT_COLOR:=$blue}"
 
-venv_prompt() {
+function venv_prompt() {
 	python_venv=""
 	# Detect python venv
-	if [[ -n "${CONDA_DEFAULT_ENV}" ]]; then
-		python_venv="($PYTHON_VENV_CHAR${CONDA_DEFAULT_ENV}) "
+	if [[ -n "${CONDA_DEFAULT_ENV:-}" ]]; then
+		python_venv="(${PYTHON_VENV_CHAR}${CONDA_DEFAULT_ENV}) "
 	elif [[ -n "${VIRTUAL_ENV}" ]]; then
-		python_venv="($PYTHON_VENV_CHAR$(basename "${VIRTUAL_ENV}")) "
+		python_venv="(${PYTHON_VENV_CHAR}${VIRTUAL_ENV##*/}) "
 	fi
 	[[ -n "${python_venv}" ]] && echo "${python_venv}"
 }
 
 function prompt_command() {
-	local retval=$? ret_status
-	ret_status="$([ $retval -eq 0 ] && echo -e "$STATUS_THEME_PROMPT_OK" || echo -e "$STATUS_THEME_PROMPT_BAD")"
-	PS1="\n${PURITY_THEME_PROMPT_COLOR}\w $(scm_prompt_info)\n${ret_status}$(venv_prompt)"
+	local retval="$?" ret_status python_venv scm_prompt_info venv_prompt
+	case "${retval}" in
+		0)
+			ret_status="$STATUS_THEME_PROMPT_OK"
+			;;
+		*)
+			ret_status="$STATUS_THEME_PROMPT_BAD"
+			;;
+	esac
+	scm_prompt_info="$(scm_prompt_info)"
+	venv_prompt="$(venv_prompt)"
+	PS1="\n${PURITY_THEME_PROMPT_COLOR}\w ${scm_prompt_info}\n${ret_status}${venv_prompt}"
 }
 
 safe_append_prompt_command prompt_command