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

Handle all unbound parameters, even colors!
---
 themes/pure/pure.theme.bash | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/themes/pure/pure.theme.bash b/themes/pure/pure.theme.bash
index 99476f4a..ba83a232 100644
--- a/themes/pure/pure.theme.bash
+++ b/themes/pure/pure.theme.bash
@@ -1,16 +1,15 @@
 # shellcheck shell=bash
 # shellcheck disable=SC2034 # Expected behavior for themes.
-# shellcheck disable=SC2154 #TODO: fix these all.
 
 # scm theming
 SCM_THEME_PROMPT_PREFIX="|"
 SCM_THEME_PROMPT_SUFFIX=""
 
-SCM_THEME_PROMPT_DIRTY=" ${bold_red}✗${normal}"
-SCM_THEME_PROMPT_CLEAN=" ${green}✓${normal}"
-SCM_GIT_CHAR="${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=" ${green?}✓${normal?}"
+SCM_GIT_CHAR="${green?}±${normal?}"
+SCM_SVN_CHAR="${bold_cyan?}⑆${normal?}"
+SCM_HG_CHAR="${bold_red?}☿${normal?}"
 
 VIRTUALENV_THEME_PROMPT_PREFIX="("
 VIRTUALENV_THEME_PROMPT_SUFFIX=")"
@@ -20,20 +19,23 @@ VIRTUALENV_THEME_PROMPT_SUFFIX=")"
 # export LSCOLORS="Gxfxcxdxbxegedabagacad"
 # export LS_COLORS='no=00:fi=00:di=01;34:ln=00;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=41;33;01:ex=00;32:*.cmd=00;32:*.exe=01;32:*.com=01;32:*.bat=01;32:*.btm=01;32:*.dll=01;32:*.tar=00;31:*.tbz=00;31:*.tgz=00;31:*.rpm=00;31:*.deb=00;31:*.arj=00;31:*.taz=00;31:*.lzh=00;31:*.lzma=00;31:*.zip=00;31:*.zoo=00;31:*.z=00;31:*.Z=00;31:*.gz=00;31:*.bz2=00;31:*.tb2=00;31:*.tz2=00;31:*.tbz2=00;31:*.avi=01;35:*.bmp=01;35:*.fli=01;35:*.gif=01;35:*.jpg=01;35:*.jpeg=01;35:*.mng=01;35:*.mov=01;35:*.mpg=01;35:*.pcx=01;35:*.pbm=01;35:*.pgm=01;35:*.png=01;35:*.ppm=01;35:*.tga=01;35:*.tif=01;35:*.xbm=01;35:*.xpm=01;35:*.dl=01;35:*.gl=01;35:*.wmv=01;35:*.aiff=00;32:*.au=00;32:*.mid=00;32:*.mp3=00;32:*.ogg=00;32:*.voc=00;32:*.wav=00;32:'
 
-pure_prompt() {
-	ps_host="${bold_blue}\h${normal}"
-	ps_user="${green}\u${normal}"
-	ps_user_mark="${green} $ ${normal}"
-	ps_root="${red}\u${red}"
-	ps_root_mark="${red} # ${normal}"
-	ps_path="${yellow}\w${normal}"
+function pure_prompt() {
+	local ps_host="${bold_blue?}\h${normal?}"
+	local ps_user="${green?}\u${normal?}"
+	local ps_user_mark="${green?} $ ${normal?}"
+	local ps_root="${red?}\u${red?}"
+	local ps_root_mark="${red?} # ${normal?}"
+	local ps_path="${yellow?}\w${normal?}"
+	local virtualenv_prompt scm_prompt
+	virtualenv_prompt="$(virtualenv_prompt)"
+	scm_prompt="$(scm_prompt)"
 	# make it work
-	case $(id -u) in
+	case "${EUID:-$UID}" in
 		0)
-			PS1="$(virtualenv_prompt)$ps_root@$ps_host$(scm_prompt):$ps_path$ps_root_mark"
+			PS1="${virtualenv_prompt}${ps_root}@${ps_host}${scm_prompt}:${ps_path}${ps_root_mark}"
 			;;
 		*)
-			PS1="$(virtualenv_prompt)$ps_user@$ps_host$(scm_prompt):$ps_path$ps_user_mark"
+			PS1="${virtualenv_prompt}${ps_user}@${ps_host}${scm_prompt}:${ps_path}${ps_user_mark}"
 			;;
 	esac
 }