From 1afbe3115877faeb1394cca662a8fdad8fff02f4 Mon Sep 17 00:00:00 2001
From: John D Pell <John+Git@gaelicWizard.net>
Date: Mon, 17 Jan 2022 14:27:06 -0800
Subject: [PATCH 1/9] theme/powerline.base: lint, clean, defaults

- Local some variables,
- install reasonable defaults, based on `theme/powerline-plain` which doens't use the special font,
- Use `\D{fmt}` instead of `$(date +fmt)`.
---
 themes/powerline/powerline.base.bash | 190 ++++++++++++++-------------
 1 file changed, 98 insertions(+), 92 deletions(-)

diff --git a/themes/powerline/powerline.base.bash b/themes/powerline/powerline.base.bash
index 84469e87..5a7b1782 100644
--- a/themes/powerline/powerline.base.bash
+++ b/themes/powerline/powerline.base.bash
@@ -1,6 +1,7 @@
 # shellcheck shell=bash
 # shellcheck disable=SC2034 # Expected behavior for themes.
 
+#To set color for foreground and background
 function set_color() {
 	local fg='' bg=''
 	if [[ "${1:-}" != "-" ]]; then
@@ -13,38 +14,38 @@ function set_color() {
 	echo -e "\[\033[${fg}${bg}m\]"
 }
 
+#Customising User Info Segment
 function __powerline_user_info_prompt() {
-	local user_info=""
-	local color=${USER_INFO_THEME_PROMPT_COLOR}
+	local user_info="${SHORT_USER:-${USER}}"
+	local color=${USER_INFO_THEME_PROMPT_COLOR-${POWERLINE_USER_INFO_COLOR-"32"}}
 
-	if [[ "${THEME_CHECK_SUDO}" = true ]]; then
-		sudo -vn 1> /dev/null 2>&1 && color=${USER_INFO_THEME_PROMPT_COLOR_SUDO}
+	if [[ "${THEME_CHECK_SUDO:-false}" == true ]]; then
+		if sudo -vn 2> /dev/null; then
+			color=${USER_INFO_THEME_PROMPT_COLOR_SUDO-${POWERLINE_USER_INFO_COLOR_SUDO-"202"}}
+		fi
 	fi
 
-	case "${POWERLINE_PROMPT_USER_INFO_MODE}" in
+	case "${POWERLINE_PROMPT_USER_INFO_MODE:-}" in
 		"sudo")
-			if [[ "${color}" = "${USER_INFO_THEME_PROMPT_COLOR_SUDO}" ]]; then
+			if [[ "${color}" == "${USER_INFO_THEME_PROMPT_COLOR_SUDO-${POWERLINE_USER_INFO_COLOR_SUDO-"202"}}" ]]; then
 				user_info="!"
 			fi
 			;;
 		*)
-			local user=${SHORT_USER:-${USER}}
-			if [[ -n "${SSH_CLIENT}" ]] || [[ -n "${SSH_CONNECTION}" ]]; then
-				user_info="${USER_INFO_SSH_CHAR}${user}"
-			else
-				user_info="${user}"
+			if [[ -n "${SSH_CLIENT:-}" ]] || [[ -n "${SSH_CONNECTION:-}" ]]; then
+				user_info="${USER_INFO_SSH_CHAR-${POWERLINE_USER_INFO_SSH_CHAR-"⌁ "}}${user_info}"
 			fi
 			;;
 	esac
-	[[ -n "${user_info}" ]] && echo "${user_info}|${color}"
+	echo "${user_info}|${color}"
 }
 
 function __powerline_terraform_prompt() {
 	local terraform_workspace=""
 
-	if [ -d .terraform ]; then
+	if [[ -d .terraform ]]; then
 		terraform_workspace="$(terraform_workspace_prompt)"
-		[[ -n "${terraform_workspace}" ]] && echo "${TERRAFORM_CHAR}${terraform_workspace}|${TERRAFORM_THEME_PROMPT_COLOR}"
+		[[ -n "${terraform_workspace}" ]] && echo "${TERRAFORM_CHAR-${POWERLINE_TERRAFORM_CHAR-"❲t❳ "}}${terraform_workspace}|${TERRAFORM_THEME_PROMPT_COLOR-${POWERLINE_TERRAFORM_COLOR-"161"}}"
 	fi
 }
 
@@ -52,18 +53,19 @@ function __powerline_gcloud_prompt() {
 	local active_gcloud_account=""
 
 	active_gcloud_account="$(active_gcloud_account_prompt)"
-	[[ -n "${active_gcloud_account}" ]] && echo "${GCLOUD_CHAR}${active_gcloud_account}|${GCLOUD_THEME_PROMPT_COLOR}"
+	[[ -n "${active_gcloud_account}" ]] && echo "${GCLOUD_CHAR-${POWERLINE_GCLOUD_CHAR-"❲G❳ "}}${active_gcloud_account}|${GCLOUD_THEME_PROMPT_COLOR-${POWERLINE_GCLOUD_COLOR-"161"}}"
 }
 
 function __powerline_node_prompt() {
 	local node_version=""
 
 	node_version="$(node_version_prompt)"
-	[[ -n "${node_version}" ]] && echo "${NODE_CHAR}${node_version}|${NODE_THEME_PROMPT_COLOR}"
+	[[ -n "${node_version}" ]] && echo "${NODE_CHAR-${POWERLINE_NODE_CHAR-="❲n❳ "}}${node_version}|${NODE_THEME_PROMPT_COLOR-${POWERLINE_NODE_COLOR-"22"}}"
 }
 
+#Customising Ruby Prompt
 function __powerline_ruby_prompt() {
-	local ruby_version=""
+	local ruby_version
 
 	if _command_exists rvm; then
 		ruby_version="$(rvm_version_prompt)"
@@ -71,7 +73,9 @@ function __powerline_ruby_prompt() {
 		ruby_version=$(rbenv_version_prompt)
 	fi
 
-	[[ -n "${ruby_version}" ]] && echo "${RUBY_CHAR}${ruby_version}|${RUBY_THEME_PROMPT_COLOR}"
+	if [[ -n "${ruby_version:-}" ]]; then
+		echo "${RUBY_CHAR-${POWERLINE_RUBY_CHAR-"💎 "}}${ruby_version}|${RUBY_THEME_PROMPT_COLOR-${POWERLINE_RUBY_COLOR-"161"}}"
+	fi
 }
 
 function __powerline_k8s_context_prompt() {
@@ -81,7 +85,7 @@ function __powerline_k8s_context_prompt() {
 		kubernetes_context="$(k8s_context_prompt)"
 	fi
 
-	[[ -n "${kubernetes_context}" ]] && echo "${KUBERNETES_CONTEXT_THEME_CHAR}${kubernetes_context}|${KUBERNETES_CONTEXT_THEME_PROMPT_COLOR}"
+	[[ -n "${kubernetes_context}" ]] && echo "${KUBERNETES_CONTEXT_THEME_CHAR-${POWERLINE_KUBERNETES_CONTEXT_CHAR-"⎈ "}}${kubernetes_context}|${KUBERNETES_CONTEXT_THEME_PROMPT_COLOR-${POWERLINE_KUBERNETES_CONTEXT_COLOR-"26"}}"
 }
 
 function __powerline_k8s_namespace_prompt() {
@@ -91,57 +95,61 @@ function __powerline_k8s_namespace_prompt() {
 		kubernetes_namespace="$(k8s_namespace_prompt)"
 	fi
 
-	[[ -n "${kubernetes_namespace}" ]] && echo "${KUBERNETES_NAMESPACE_THEME_CHAR}${kubernetes_namespace}|${KUBERNETES_NAMESPACE_THEME_PROMPT_COLOR}"
+	[[ -n "${kubernetes_namespace}" ]] && echo "${KUBERNETES_NAMESPACE_THEME_CHAR-${POWERLINE_KUBERNETES_NAMESPACE_CHAR-"⎈ "}}${kubernetes_namespace}|${KUBERNETES_NAMESPACE_THEME_PROMPT_COLOR-${POWERLINE_KUBERNETES_NAMESPACE_COLOR-"60"}}"
 }
 
+#Customising Python (venv) Prompt
 function __powerline_python_venv_prompt() {
 	local python_venv=""
 
 	if [[ -n "${CONDA_DEFAULT_ENV:-}" ]]; then
 		python_venv="${CONDA_DEFAULT_ENV}"
-		PYTHON_VENV_CHAR=${CONDA_PYTHON_VENV_CHAR}
+		local PYTHON_VENV_CHAR=${CONDA_PYTHON_VENV_CHAR-${POWERLINE_CONDA_PYTHON_VENV_CHAR-"ⓔ "}}
 	elif [[ -n "${VIRTUAL_ENV:-}" ]]; then
 		python_venv="${VIRTUAL_ENV##*/}"
 	fi
 
-	[[ -n "${python_venv}" ]] && echo "${PYTHON_VENV_CHAR}${python_venv}|${PYTHON_VENV_THEME_PROMPT_COLOR}"
+	[[ -n "${python_venv}" ]] && echo "${PYTHON_VENV_CHAR-${POWERLINE_PYTHON_VENV_CHAR-"ⓔ "}}${python_venv}|${PYTHON_VENV_THEME_PROMPT_COLOR-${POWERLINE_PYTHON_VENV_COLOR-"35"}}"
 }
 
+#Customising SCM(GIT) Prompt
 function __powerline_scm_prompt() {
 	local color=""
 	local scm_prompt=""
 
 	scm_prompt_vars
 
-	if [[ "${SCM_NONE_CHAR}" != "${SCM_CHAR}" ]]; then
-		if [[ "${SCM_DIRTY}" -eq 3 ]]; then
-			color=${SCM_THEME_PROMPT_STAGED_COLOR}
-		elif [[ "${SCM_DIRTY}" -eq 2 ]]; then
-			color=${SCM_THEME_PROMPT_UNSTAGED_COLOR}
-		elif [[ "${SCM_DIRTY}" -eq 1 ]]; then
-			color=${SCM_THEME_PROMPT_DIRTY_COLOR}
+	if [[ "${SCM_NONE_CHAR?}" != "${SCM_CHAR?}" ]]; then
+		if [[ "${SCM_DIRTY?}" -eq 3 ]]; then
+			color=${SCM_THEME_PROMPT_STAGED_COLOR-${POWERLINE_SCM_STAGED_COLOR-"30"}}
+		elif [[ "${SCM_DIRTY?}" -eq 2 ]]; then
+			color=${SCM_THEME_PROMPT_UNSTAGED_COLOR-${POWERLINE_SCM_UNSTAGED_COLOR-"92"}}
+		elif [[ "${SCM_DIRTY?}" -eq 1 ]]; then
+			color=${SCM_THEME_PROMPT_DIRTY_COLOR-${POWERLINE_SCM_DIRTY_COLOR-"88"}}
+		elif [[ "${SCM_DIRTY?}" -eq 0 ]]; then
+			color=${SCM_THEME_PROMPT_CLEAN_COLOR-${POWERLINE_SCM_CLEAN_COLOR-"25"}}
 		else
-			color=${SCM_THEME_PROMPT_CLEAN_COLOR}
+			color=${SCM_THEME_PROMPT_COLOR-${POWERLINE_SCM_CLEAN_COLOR-"25"}}
 		fi
-		if [[ "${SCM_GIT_CHAR}" == "${SCM_CHAR}" ]]; then
-			scm_prompt+="${SCM_CHAR}${SCM_BRANCH}${SCM_STATE}"
-		elif [[ "${SCM_P4_CHAR}" == "${SCM_CHAR}" ]]; then
-			scm_prompt+="${SCM_CHAR}${SCM_BRANCH}${SCM_STATE}"
-		elif [[ "${SCM_HG_CHAR}" == "${SCM_CHAR}" ]]; then
-			scm_prompt+="${SCM_CHAR}${SCM_BRANCH}${SCM_STATE}"
-		elif [[ "${SCM_SVN_CHAR}" == "${SCM_CHAR}" ]]; then
-			scm_prompt+="${SCM_CHAR}${SCM_BRANCH}${SCM_STATE}"
+		if [[ "${SCM_GIT_CHAR?}" == "${SCM_CHAR?}" ]]; then
+			scm_prompt+="${SCM_CHAR}${SCM_BRANCH?}${SCM_STATE?}"
+		elif [[ "${SCM_P4_CHAR?}" == "${SCM_CHAR}" ]]; then
+			scm_prompt+="${SCM_CHAR}${SCM_BRANCH?}${SCM_STATE?}"
+		elif [[ "${SCM_HG_CHAR?}" == "${SCM_CHAR}" ]]; then
+			scm_prompt+="${SCM_CHAR}${SCM_BRANCH?}${SCM_STATE?}"
+		elif [[ "${SCM_SVN_CHAR?}" == "${SCM_CHAR}" ]]; then
+			scm_prompt+="${SCM_CHAR}${SCM_BRANCH?}${SCM_STATE?}"
 		fi
-		echo "${scm_prompt?}|${color}"
+		echo "${scm_prompt}|${color}"
 	fi
 }
 
 function __powerline_cwd_prompt() {
-	echo "\w|${CWD_THEME_PROMPT_COLOR}"
+	echo "\w|${CWD_THEME_PROMPT_COLOR-240}"
 }
 
 function __powerline_hostname_prompt() {
-	echo "${SHORT_HOSTNAME:-$(hostname -s)}|${HOST_THEME_PROMPT_COLOR}"
+	echo "\h|${HOST_THEME_PROMPT_COLOR-"0"}"
 }
 
 function __powerline_wd_prompt() {
@@ -149,7 +157,7 @@ function __powerline_wd_prompt() {
 }
 
 function __powerline_clock_prompt() {
-	echo "$(date +"${THEME_CLOCK_FORMAT}")|${CLOCK_THEME_PROMPT_COLOR}"
+	echo "\D{${THEME_CLOCK_FORMAT-"%H:%M:%S"}}|${CLOCK_THEME_PROMPT_COLOR-"240"}"
 }
 
 function __powerline_battery_prompt() {
@@ -160,149 +168,147 @@ function __powerline_battery_prompt() {
 		true
 	else
 		if [[ "$((10#${battery_status}))" -le 5 ]]; then
-			color="${BATTERY_STATUS_THEME_PROMPT_CRITICAL_COLOR}"
+			color="${BATTERY_STATUS_THEME_PROMPT_CRITICAL_COLOR-"160"}"
 		elif [[ "$((10#${battery_status}))" -le 25 ]]; then
-			color="${BATTERY_STATUS_THEME_PROMPT_LOW_COLOR}"
+			color="${BATTERY_STATUS_THEME_PROMPT_LOW_COLOR-"208"}"
 		else
-			color="${BATTERY_STATUS_THEME_PROMPT_GOOD_COLOR}"
+			color="${BATTERY_STATUS_THEME_PROMPT_GOOD_COLOR-"70"}"
 		fi
-		ac_adapter_connected && battery_status="${BATTERY_AC_CHAR}${battery_status}"
+		ac_adapter_connected && battery_status="${BATTERY_AC_CHAR-"+ "}${battery_status}"
 		echo "${battery_status}%|${color}"
 	fi
 }
 
 function __powerline_in_vim_prompt() {
-	if [[ -n "$VIMRUNTIME" ]]; then
-		echo "${IN_VIM_THEME_PROMPT_TEXT}|${IN_VIM_THEME_PROMPT_COLOR}"
+	if [[ -n "${VIMRUNTIME:-}" ]]; then
+		echo "${IN_VIM_THEME_PROMPT_TEXT-"vim"}|${IN_VIM_THEME_PROMPT_COLOR-"245"}"
 	fi
 }
 
 function __powerline_aws_profile_prompt() {
-	if [[ -n "${AWS_PROFILE}" ]]; then
-		echo "${AWS_PROFILE_CHAR}${AWS_PROFILE}|${AWS_PROFILE_PROMPT_COLOR}"
+	if [[ -n "${AWS_PROFILE:-}" ]]; then
+		echo "${AWS_PROFILE_CHAR-${POWERLINE_AWS_PROFILE_CHAR-"❲aws❳ "}}${AWS_PROFILE}|${AWS_PROFILE_PROMPT_COLOR-${POWERLINE_AWS_PROFILE_COLOR-"208"}}"
 	fi
 }
 
 function __powerline_in_toolbox_prompt() {
-	if [ -f /run/.containerenv ] && [ -f /run/.toolboxenv ]; then
-		echo "${IN_TOOLBOX_THEME_PROMPT_TEXT}|${IN_TOOLBOX_THEME_PROMPT_COLOR}"
+	if [[ -f /run/.containerenv ]] && [[ -f /run/.toolboxenv ]]; then
+		echo "${IN_TOOLBOX_THEME_PROMPT_TEXT-"⬢ "}|${IN_TOOLBOX_THEME_PROMPT_COLOR-"125"}"
 	fi
 }
 
 function __powerline_shlvl_prompt() {
 	if [[ "${SHLVL}" -gt 1 ]]; then
-		local prompt="${SHLVL_THEME_PROMPT_CHAR}"
+		local prompt="${SHLVL_THEME_PROMPT_CHAR-"§"}"
 		local level=$((SHLVL - 1))
-		echo "${prompt}${level}|${SHLVL_THEME_PROMPT_COLOR}"
+		echo "${prompt}${level}|${SHLVL_THEME_PROMPT_COLOR-${HOST_THEME_PROMPT_COLOR-"0"}}"
 	fi
 }
 
 function __powerline_dirstack_prompt() {
 	if [[ "${#DIRSTACK[@]}" -gt 1 ]]; then
 		local depth=$((${#DIRSTACK[@]} - 1))
-		local prompt="${DIRSTACK_THEME_PROMPT_CHAR}"
+		local prompt="${DIRSTACK_THEME_PROMPT_CHAR-${POWERLINE_DIRSTACK_CHAR-"←"}}"
 		if [[ "${depth}" -ge 2 ]]; then
 			prompt+="${depth}"
 		fi
-		echo "${prompt}|${DIRSTACK_THEME_PROMPT_COLOR}"
+		echo "${prompt}|${DIRSTACK_THEME_PROMPT_COLOR-${POWERLINE_DIRSTACK_COLOR-${CWD_THEME_PROMPT_COLOR-${POWERLINE_CWD_COLOR-"240"}}}}"
 	fi
 }
 
 function __powerline_history_number_prompt() {
-	echo "${HISTORY_NUMBER_THEME_PROMPT_CHAR}\!|${HISTORY_NUMBER_THEME_PROMPT_COLOR}"
+	echo "${HISTORY_NUMBER_THEME_PROMPT_CHAR-${POWERLINE_HISTORY_NUMBER_CHAR-"#"}}\!|${HISTORY_NUMBER_THEME_PROMPT_COLOR-${POWERLINE_HISTORY_NUMBER_COLOR-"0"}}"
 }
 
 function __powerline_command_number_prompt() {
-	echo "${COMMAND_NUMBER_THEME_PROMPT_CHAR}\#|${COMMAND_NUMBER_THEME_PROMPT_COLOR}"
+	echo "${COMMAND_NUMBER_THEME_PROMPT_CHAR-${POWERLINE_COMMAND_NUMBER_CHAR-"#"}}\#|${COMMAND_NUMBER_THEME_PROMPT_COLOR-${POWERLINE_COMMAND_NUMBER_COLOR-"0"}}"
 }
 
 function __powerline_duration_prompt() {
 	local duration
 	duration=$(_command_duration)
-	[[ -n "$duration" ]] && echo "${duration}|${COMMAND_DURATION_PROMPT_COLOR}"
+	[[ -n "$duration" ]] && echo "${duration}|${COMMAND_DURATION_PROMPT_COLOR?}"
 }
 
 function __powerline_left_segment() {
-	local params
+	local -a params
 	IFS="|" read -ra params <<< "${1}"
 	local pad_before_segment=" "
 
-	if [[ "${SEGMENTS_AT_LEFT}" -eq 0 ]]; then
-		if [[ "${POWERLINE_COMPACT_BEFORE_FIRST_SEGMENT}" -ne 0 ]]; then
+	#for seperator character
+	if [[ "${SEGMENTS_AT_LEFT?}" -eq 0 ]]; then
+		if [[ "${POWERLINE_COMPACT_BEFORE_FIRST_SEGMENT:-0}" -ne 0 ]]; then
 			pad_before_segment=""
 		fi
 	else
-		if [[ "${POWERLINE_COMPACT_AFTER_SEPARATOR}" -ne 0 ]]; then
+		if [[ "${POWERLINE_COMPACT_AFTER_SEPARATOR:-0}" -ne 0 ]]; then
 			pad_before_segment=""
 		fi
 		# Since the previous segment wasn't the last segment, add padding, if needed
 		#
-		if [[ "${POWERLINE_COMPACT_BEFORE_SEPARATOR}" -eq 0 ]]; then
-			LEFT_PROMPT+="$(set_color - "${LAST_SEGMENT_COLOR}") ${normal?}"
+		if [[ "${POWERLINE_COMPACT_BEFORE_SEPARATOR:-0}" -eq 0 ]]; then
+			LEFT_PROMPT+="$(set_color - "${LAST_SEGMENT_COLOR?}") ${normal?}"
 		fi
-		if [[ "${LAST_SEGMENT_COLOR}" -eq "${params[1]}" ]]; then
-			LEFT_PROMPT+="$(set_color - "${LAST_SEGMENT_COLOR}")${POWERLINE_LEFT_SEPARATOR_SOFT}${normal?}"
+		if [[ "${LAST_SEGMENT_COLOR?}" -eq "${params[1]:-}" ]]; then
+			LEFT_PROMPT+="$(set_color - "${LAST_SEGMENT_COLOR?}")${POWERLINE_LEFT_SEPARATOR_SOFT:- }${normal?}"
 		else
-			LEFT_PROMPT+="$(set_color "${LAST_SEGMENT_COLOR}" "${params[1]}")${POWERLINE_LEFT_SEPARATOR}${normal?}"
+			LEFT_PROMPT+="$(set_color "${LAST_SEGMENT_COLOR?}" "${params[1]:-}")${POWERLINE_LEFT_SEPARATOR:- }${normal?}"
 		fi
 	fi
 
-	LEFT_PROMPT+="$(set_color - "${params[1]}")${pad_before_segment}${params[0]}${normal}"
-	LAST_SEGMENT_COLOR=${params[1]}
+	#change here to cahnge fg color
+	LEFT_PROMPT+="$(set_color - "${params[1]:-}")${pad_before_segment}${params[0]}${normal?}"
+	#seperator char color == current bg
+	LAST_SEGMENT_COLOR="${params[1]:-}"
 	((SEGMENTS_AT_LEFT += 1))
 }
 
 function __powerline_left_last_segment_padding() {
-	LEFT_PROMPT+="$(set_color - "${LAST_SEGMENT_COLOR}") ${normal?}"
+	LEFT_PROMPT+="$(set_color - "${LAST_SEGMENT_COLOR?}") ${normal?}"
 }
 
 function __powerline_last_status_prompt() {
-	[[ "$1" -ne 0 ]] && echo "${1}|${LAST_STATUS_THEME_PROMPT_COLOR}"
+	[[ "$1" -ne 0 ]] && echo "${1}|${LAST_STATUS_THEME_PROMPT_COLOR-"52"}"
 }
 
 function __powerline_prompt_command() {
 	local last_status="$?" ## always the first
-	local separator_char="${POWERLINE_PROMPT_CHAR}" info prompt_color
+	local info prompt_color segment
 
-	LEFT_PROMPT=""
-	SEGMENTS_AT_LEFT=0
-	LAST_SEGMENT_COLOR=""
+	local LEFT_PROMPT=""
+	local SEGMENTS_AT_LEFT=0
+	local LAST_SEGMENT_COLOR=""
 
 	_save-and-reload-history "${HISTORY_AUTOSAVE:-0}"
 
-	if [[ -n "${POWERLINE_PROMPT_DISTRO_LOGO}" ]]; then
-		LEFT_PROMPT+="$(set_color "${PROMPT_DISTRO_LOGO_COLOR}" "${PROMPT_DISTRO_LOGO_COLORBG}")${PROMPT_DISTRO_LOGO}$(set_color - -)"
+	if [[ -n "${POWERLINE_PROMPT_DISTRO_LOGO:-}" ]]; then
+		LEFT_PROMPT+="$(set_color "${PROMPT_DISTRO_LOGO_COLOR?}" "${PROMPT_DISTRO_LOGO_COLORBG?}")${PROMPT_DISTRO_LOGO?}$(set_color - -)"
 	fi
 
 	## left prompt ##
-	for segment in $POWERLINE_PROMPT; do
-		info="$(__powerline_"${segment}"_prompt)"
+	for segment in ${POWERLINE_PROMPT-"user_info" "scm" "python_venv" "ruby" "node" "cwd"}; do
+		info="$("__powerline_${segment}_prompt")"
 		[[ -n "${info}" ]] && __powerline_left_segment "${info}"
 	done
 
 	[[ "${last_status}" -ne 0 ]] && __powerline_left_segment "$(__powerline_last_status_prompt "${last_status}")"
 
-	if [[ -n "${LEFT_PROMPT}" ]] && [[ "${POWERLINE_COMPACT_AFTER_LAST_SEGMENT:-}" -eq 0 ]]; then
+	if [[ -n "${LEFT_PROMPT:-}" ]] && [[ "${POWERLINE_COMPACT_AFTER_LAST_SEGMENT:-0}" -eq 0 ]]; then
 		__powerline_left_last_segment_padding
 	fi
 
 	# By default we try to match the prompt to the adjacent segment's background color,
 	# but when part of the prompt exists within that segment, we instead match the foreground color.
-	prompt_color="$(set_color "${LAST_SEGMENT_COLOR}" -)"
-	if [[ -n "${LEFT_PROMPT}" ]] && [[ -n "${POWERLINE_LEFT_LAST_SEGMENT_PROMPT_CHAR}" ]]; then
-		LEFT_PROMPT+="$(set_color - "${LAST_SEGMENT_COLOR}")${POWERLINE_LEFT_LAST_SEGMENT_PROMPT_CHAR}"
+	prompt_color="$(set_color "${LAST_SEGMENT_COLOR?}" -)"
+	if [[ -n "${LEFT_PROMPT:-}" ]] && [[ -n "${POWERLINE_LEFT_LAST_SEGMENT_PROMPT_CHAR:-}" ]]; then
+		LEFT_PROMPT+="$(set_color - "${LAST_SEGMENT_COLOR?}")${POWERLINE_LEFT_LAST_SEGMENT_PROMPT_CHAR}"
 		prompt_color="${normal?}"
 	fi
-	[[ -n "${LEFT_PROMPT}" ]] && LEFT_PROMPT+="${prompt_color}${separator_char}${normal?}"
+	[[ -n "${LEFT_PROMPT:-}" ]] && LEFT_PROMPT+="${prompt_color}${POWERLINE_PROMPT_CHAR-\\$}${normal?}"
 
-	if [[ "${POWERLINE_COMPACT_PROMPT:-}" -eq 0 ]]; then
+	if [[ "${POWERLINE_COMPACT_PROMPT:-0}" -eq 0 ]]; then
 		LEFT_PROMPT+=" "
 	fi
 
-	PS1="${LEFT_PROMPT}"
-
-	## cleanup ##
-	unset LAST_SEGMENT_COLOR \
-		LEFT_PROMPT \
-		SEGMENTS_AT_LEFT
+	PS1="${LEFT_PROMPT?}"
 }

From c697ada0a5a83709ea32597a080a946fe96a569e Mon Sep 17 00:00:00 2001
From: John D Pell <John+Git@gaelicWizard.net>
Date: Sat, 12 Feb 2022 21:22:47 -0800
Subject: [PATCH 2/9] theme/powerline-base: allow `$POWERLINE_PROMPT` as array

---
 themes/powerline/powerline.base.bash | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/themes/powerline/powerline.base.bash b/themes/powerline/powerline.base.bash
index 5a7b1782..8c1f1c6b 100644
--- a/themes/powerline/powerline.base.bash
+++ b/themes/powerline/powerline.base.bash
@@ -286,7 +286,8 @@ function __powerline_prompt_command() {
 	fi
 
 	## left prompt ##
-	for segment in ${POWERLINE_PROMPT-"user_info" "scm" "python_venv" "ruby" "node" "cwd"}; do
+	# shellcheck disable=SC2068 # intended behavior
+	for segment in ${POWERLINE_PROMPT[@]-"user_info" "scm" "python_venv" "ruby" "node" "cwd"}; do
 		info="$("__powerline_${segment}_prompt")"
 		[[ -n "${info}" ]] && __powerline_left_segment "${info}"
 	done

From ee779c8bb74b06885a682a4a5338505bfab09d1a Mon Sep 17 00:00:00 2001
From: John D Pell <John+Git@gaelicWizard.net>
Date: Thu, 10 Feb 2022 21:16:25 -0800
Subject: [PATCH 3/9] theme/powerline base: //echo/printf
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Alsö:
- Use `\u` instead of `${SHORT_USER:-${USER?}}`.
- Use `if`/`then` properly.
- Lose some whitespace from prompt characters; that's what padding is for.

TODO:
- prompt character prefix/suffix support
- use variables rather than subshells...
---
 themes/powerline/powerline.base.bash | 96 +++++++++++++++++-----------
 1 file changed, 60 insertions(+), 36 deletions(-)

diff --git a/themes/powerline/powerline.base.bash b/themes/powerline/powerline.base.bash
index 8c1f1c6b..45e5efb6 100644
--- a/themes/powerline/powerline.base.bash
+++ b/themes/powerline/powerline.base.bash
@@ -9,14 +9,16 @@ function set_color() {
 	fi
 	if [[ "${2:-}" != "-" ]]; then
 		bg="48;5;${2}"
-		[[ -n "${fg}" ]] && bg=";${bg}"
+		if [[ -n "${fg}" ]]; then
+			bg=";${bg}"
+		fi
 	fi
-	echo -e "\[\033[${fg}${bg}m\]"
+	printf '\[\\e[%s%sm\]' "${fg}" "${bg}"
 }
 
 #Customising User Info Segment
 function __powerline_user_info_prompt() {
-	local user_info="${SHORT_USER:-${USER}}"
+	local user_info='\u'
 	local color=${USER_INFO_THEME_PROMPT_COLOR-${POWERLINE_USER_INFO_COLOR-"32"}}
 
 	if [[ "${THEME_CHECK_SUDO:-false}" == true ]]; then
@@ -32,12 +34,12 @@ function __powerline_user_info_prompt() {
 			fi
 			;;
 		*)
-			if [[ -n "${SSH_CLIENT:-}" ]] || [[ -n "${SSH_CONNECTION:-}" ]]; then
-				user_info="${USER_INFO_SSH_CHAR-${POWERLINE_USER_INFO_SSH_CHAR-"⌁ "}}${user_info}"
+			if [[ -n "${SSH_CLIENT:-}" || -n "${SSH_CONNECTION:-}" ]]; then
+				user_info="${USER_INFO_SSH_CHAR-${POWERLINE_USER_INFO_SSH_CHAR-"⌁"}}${user_info}"
 			fi
 			;;
 	esac
-	echo "${user_info}|${color}"
+	printf '%s|%s' "${user_info}" "${color}"
 }
 
 function __powerline_terraform_prompt() {
@@ -45,7 +47,9 @@ function __powerline_terraform_prompt() {
 
 	if [[ -d .terraform ]]; then
 		terraform_workspace="$(terraform_workspace_prompt)"
-		[[ -n "${terraform_workspace}" ]] && echo "${TERRAFORM_CHAR-${POWERLINE_TERRAFORM_CHAR-"❲t❳ "}}${terraform_workspace}|${TERRAFORM_THEME_PROMPT_COLOR-${POWERLINE_TERRAFORM_COLOR-"161"}}"
+		if [[ -n "${terraform_workspace}" ]]; then
+			printf '%s%s|%s' "${TERRAFORM_CHAR-${POWERLINE_TERRAFORM_CHAR-"❲t❳"}}" "${terraform_workspace}" "${TERRAFORM_THEME_PROMPT_COLOR-${POWERLINE_TERRAFORM_COLOR-"161"}}"
+		fi
 	fi
 }
 
@@ -53,14 +57,18 @@ function __powerline_gcloud_prompt() {
 	local active_gcloud_account=""
 
 	active_gcloud_account="$(active_gcloud_account_prompt)"
-	[[ -n "${active_gcloud_account}" ]] && echo "${GCLOUD_CHAR-${POWERLINE_GCLOUD_CHAR-"❲G❳ "}}${active_gcloud_account}|${GCLOUD_THEME_PROMPT_COLOR-${POWERLINE_GCLOUD_COLOR-"161"}}"
+	if [[ -n "${active_gcloud_account}" ]]; then
+		printf '%s%s|%s' "${GCLOUD_CHAR-${POWERLINE_GCLOUD_CHAR-"❲G❳"}}" "${active_gcloud_account}" "${GCLOUD_THEME_PROMPT_COLOR-${POWERLINE_GCLOUD_COLOR-"161"}}"
+	fi
 }
 
 function __powerline_node_prompt() {
 	local node_version=""
 
 	node_version="$(node_version_prompt)"
-	[[ -n "${node_version}" ]] && echo "${NODE_CHAR-${POWERLINE_NODE_CHAR-="❲n❳ "}}${node_version}|${NODE_THEME_PROMPT_COLOR-${POWERLINE_NODE_COLOR-"22"}}"
+	if [[ -n "${node_version}" ]]; then
+		printf '%s%s|%s' "${NODE_CHAR-${POWERLINE_NODE_CHAR-="❲n❳"}}" "${node_version}" "${NODE_THEME_PROMPT_COLOR-${POWERLINE_NODE_COLOR-"22"}}"
+	fi
 }
 
 #Customising Ruby Prompt
@@ -74,7 +82,7 @@ function __powerline_ruby_prompt() {
 	fi
 
 	if [[ -n "${ruby_version:-}" ]]; then
-		echo "${RUBY_CHAR-${POWERLINE_RUBY_CHAR-"💎 "}}${ruby_version}|${RUBY_THEME_PROMPT_COLOR-${POWERLINE_RUBY_COLOR-"161"}}"
+		printf '%s%s|%s' "${RUBY_CHAR-${POWERLINE_RUBY_CHAR-"💎"}}" "${ruby_version}" "${RUBY_THEME_PROMPT_COLOR-${POWERLINE_RUBY_COLOR-"161"}}"
 	fi
 }
 
@@ -85,7 +93,9 @@ function __powerline_k8s_context_prompt() {
 		kubernetes_context="$(k8s_context_prompt)"
 	fi
 
-	[[ -n "${kubernetes_context}" ]] && echo "${KUBERNETES_CONTEXT_THEME_CHAR-${POWERLINE_KUBERNETES_CONTEXT_CHAR-"⎈ "}}${kubernetes_context}|${KUBERNETES_CONTEXT_THEME_PROMPT_COLOR-${POWERLINE_KUBERNETES_CONTEXT_COLOR-"26"}}"
+	if [[ -n "${kubernetes_context}" ]]; then
+		printf '%s%s|%s' "${KUBERNETES_CONTEXT_THEME_CHAR-${POWERLINE_KUBERNETES_CONTEXT_CHAR-"⎈"}}" "${kubernetes_context}" "${KUBERNETES_CONTEXT_THEME_PROMPT_COLOR-${POWERLINE_KUBERNETES_CONTEXT_COLOR-"26"}}"
+	fi
 }
 
 function __powerline_k8s_namespace_prompt() {
@@ -95,7 +105,9 @@ function __powerline_k8s_namespace_prompt() {
 		kubernetes_namespace="$(k8s_namespace_prompt)"
 	fi
 
-	[[ -n "${kubernetes_namespace}" ]] && echo "${KUBERNETES_NAMESPACE_THEME_CHAR-${POWERLINE_KUBERNETES_NAMESPACE_CHAR-"⎈ "}}${kubernetes_namespace}|${KUBERNETES_NAMESPACE_THEME_PROMPT_COLOR-${POWERLINE_KUBERNETES_NAMESPACE_COLOR-"60"}}"
+	if [[ -n "${kubernetes_namespace}" ]]; then
+		printf '%s%s|%s' "${KUBERNETES_NAMESPACE_THEME_CHAR-${POWERLINE_KUBERNETES_NAMESPACE_CHAR-"⎈"}}" "${kubernetes_namespace}" "${KUBERNETES_NAMESPACE_THEME_PROMPT_COLOR-${POWERLINE_KUBERNETES_NAMESPACE_COLOR-"60"}}"
+	fi
 }
 
 #Customising Python (venv) Prompt
@@ -104,12 +116,14 @@ function __powerline_python_venv_prompt() {
 
 	if [[ -n "${CONDA_DEFAULT_ENV:-}" ]]; then
 		python_venv="${CONDA_DEFAULT_ENV}"
-		local PYTHON_VENV_CHAR=${CONDA_PYTHON_VENV_CHAR-${POWERLINE_CONDA_PYTHON_VENV_CHAR-"ⓔ "}}
+		local PYTHON_VENV_CHAR=${CONDA_PYTHON_VENV_CHAR-${POWERLINE_CONDA_PYTHON_VENV_CHAR-"ⓔ"}}
 	elif [[ -n "${VIRTUAL_ENV:-}" ]]; then
 		python_venv="${VIRTUAL_ENV##*/}"
 	fi
 
-	[[ -n "${python_venv}" ]] && echo "${PYTHON_VENV_CHAR-${POWERLINE_PYTHON_VENV_CHAR-"ⓔ "}}${python_venv}|${PYTHON_VENV_THEME_PROMPT_COLOR-${POWERLINE_PYTHON_VENV_COLOR-"35"}}"
+	if [[ -n "${python_venv}" ]]; then
+		printf '%s%s|%s' "${PYTHON_VENV_CHAR-${POWERLINE_PYTHON_VENV_CHAR-"ⓔ"}}" "${python_venv}" "${PYTHON_VENV_THEME_PROMPT_COLOR-${POWERLINE_PYTHON_VENV_COLOR-"35"}}"
+	fi
 }
 
 #Customising SCM(GIT) Prompt
@@ -140,24 +154,24 @@ function __powerline_scm_prompt() {
 		elif [[ "${SCM_SVN_CHAR?}" == "${SCM_CHAR}" ]]; then
 			scm_prompt+="${SCM_CHAR}${SCM_BRANCH?}${SCM_STATE?}"
 		fi
-		echo "${scm_prompt}|${color}"
+		printf '%s|%s' "${scm_prompt}" "${color}"
 	fi
 }
 
 function __powerline_cwd_prompt() {
-	echo "\w|${CWD_THEME_PROMPT_COLOR-240}"
+	printf '%s|%s' "\w" "${CWD_THEME_PROMPT_COLOR-"240"}"
 }
 
 function __powerline_hostname_prompt() {
-	echo "\h|${HOST_THEME_PROMPT_COLOR-"0"}"
+	printf '%s|%s' "\h" "${HOST_THEME_PROMPT_COLOR-"0"}"
 }
 
 function __powerline_wd_prompt() {
-	echo "\W|${CWD_THEME_PROMPT_COLOR}"
+	printf '%s|%s' "\W" "${CWD_THEME_PROMPT_COLOR-"240"}"
 }
 
 function __powerline_clock_prompt() {
-	echo "\D{${THEME_CLOCK_FORMAT-"%H:%M:%S"}}|${CLOCK_THEME_PROMPT_COLOR-"240"}"
+	printf '%s|%s' "\D{${THEME_CLOCK_FORMAT-"%H:%M:%S"}}" "${CLOCK_THEME_PROMPT_COLOR-"240"}"
 }
 
 function __powerline_battery_prompt() {
@@ -174,26 +188,28 @@ function __powerline_battery_prompt() {
 		else
 			color="${BATTERY_STATUS_THEME_PROMPT_GOOD_COLOR-"70"}"
 		fi
-		ac_adapter_connected && battery_status="${BATTERY_AC_CHAR-"+ "}${battery_status}"
-		echo "${battery_status}%|${color}"
+		if ac_adapter_connected; then
+			battery_status="${BATTERY_AC_CHAR-"+"}${battery_status}"
+		fi
+		printf '%s|%s' "${battery_status}%" "${color}"
 	fi
 }
 
 function __powerline_in_vim_prompt() {
 	if [[ -n "${VIMRUNTIME:-}" ]]; then
-		echo "${IN_VIM_THEME_PROMPT_TEXT-"vim"}|${IN_VIM_THEME_PROMPT_COLOR-"245"}"
+		printf '%s|%s' "${IN_VIM_THEME_PROMPT_TEXT-"vim"}" "${IN_VIM_THEME_PROMPT_COLOR-"245"}"
 	fi
 }
 
 function __powerline_aws_profile_prompt() {
 	if [[ -n "${AWS_PROFILE:-}" ]]; then
-		echo "${AWS_PROFILE_CHAR-${POWERLINE_AWS_PROFILE_CHAR-"❲aws❳ "}}${AWS_PROFILE}|${AWS_PROFILE_PROMPT_COLOR-${POWERLINE_AWS_PROFILE_COLOR-"208"}}"
+		printf '%s%s|%s' "${AWS_PROFILE_CHAR-${POWERLINE_AWS_PROFILE_CHAR-"❲aws❳"}}" "${AWS_PROFILE}" "${AWS_PROFILE_PROMPT_COLOR-${POWERLINE_AWS_PROFILE_COLOR-"208"}}"
 	fi
 }
 
 function __powerline_in_toolbox_prompt() {
-	if [[ -f /run/.containerenv ]] && [[ -f /run/.toolboxenv ]]; then
-		echo "${IN_TOOLBOX_THEME_PROMPT_TEXT-"⬢ "}|${IN_TOOLBOX_THEME_PROMPT_COLOR-"125"}"
+	if [[ -f /run/.containerenv && -f /run/.toolboxenv ]]; then
+		printf '%s|%s' "${IN_TOOLBOX_THEME_PROMPT_TEXT-"⬢"}" "${IN_TOOLBOX_THEME_PROMPT_COLOR-"125"}"
 	fi
 }
 
@@ -201,7 +217,7 @@ function __powerline_shlvl_prompt() {
 	if [[ "${SHLVL}" -gt 1 ]]; then
 		local prompt="${SHLVL_THEME_PROMPT_CHAR-"§"}"
 		local level=$((SHLVL - 1))
-		echo "${prompt}${level}|${SHLVL_THEME_PROMPT_COLOR-${HOST_THEME_PROMPT_COLOR-"0"}}"
+		printf '%s|%s' "${prompt}${level}" "${SHLVL_THEME_PROMPT_COLOR-${HOST_THEME_PROMPT_COLOR-"0"}}"
 	fi
 }
 
@@ -212,22 +228,24 @@ function __powerline_dirstack_prompt() {
 		if [[ "${depth}" -ge 2 ]]; then
 			prompt+="${depth}"
 		fi
-		echo "${prompt}|${DIRSTACK_THEME_PROMPT_COLOR-${POWERLINE_DIRSTACK_COLOR-${CWD_THEME_PROMPT_COLOR-${POWERLINE_CWD_COLOR-"240"}}}}"
+		printf '%s|%s' "${prompt}" "${DIRSTACK_THEME_PROMPT_COLOR-${POWERLINE_DIRSTACK_COLOR-${CWD_THEME_PROMPT_COLOR-${POWERLINE_CWD_COLOR-"240"}}}}"
 	fi
 }
 
 function __powerline_history_number_prompt() {
-	echo "${HISTORY_NUMBER_THEME_PROMPT_CHAR-${POWERLINE_HISTORY_NUMBER_CHAR-"#"}}\!|${HISTORY_NUMBER_THEME_PROMPT_COLOR-${POWERLINE_HISTORY_NUMBER_COLOR-"0"}}"
+	printf '%s%s|%s' "${HISTORY_NUMBER_THEME_PROMPT_CHAR-${POWERLINE_HISTORY_NUMBER_CHAR-"#"}}" '\!' "${HISTORY_NUMBER_THEME_PROMPT_COLOR-${POWERLINE_HISTORY_NUMBER_COLOR-"0"}}"
 }
 
 function __powerline_command_number_prompt() {
-	echo "${COMMAND_NUMBER_THEME_PROMPT_CHAR-${POWERLINE_COMMAND_NUMBER_CHAR-"#"}}\#|${COMMAND_NUMBER_THEME_PROMPT_COLOR-${POWERLINE_COMMAND_NUMBER_COLOR-"0"}}"
+	printf '%s%s|%s' "${COMMAND_NUMBER_THEME_PROMPT_CHAR-${POWERLINE_COMMAND_NUMBER_CHAR-"#"}}" '\#' "${COMMAND_NUMBER_THEME_PROMPT_COLOR-${POWERLINE_COMMAND_NUMBER_COLOR-"0"}}"
 }
 
 function __powerline_duration_prompt() {
 	local duration
 	duration=$(_command_duration)
-	[[ -n "$duration" ]] && echo "${duration}|${COMMAND_DURATION_PROMPT_COLOR?}"
+	if [[ -n "$duration" ]]; then
+		printf '%s|%s' "${duration}" "${COMMAND_DURATION_PROMPT_COLOR?}"
+	fi
 }
 
 function __powerline_left_segment() {
@@ -268,7 +286,9 @@ function __powerline_left_last_segment_padding() {
 }
 
 function __powerline_last_status_prompt() {
-	[[ "$1" -ne 0 ]] && echo "${1}|${LAST_STATUS_THEME_PROMPT_COLOR-"52"}"
+	if [[ "${1?}" -ne 0 ]]; then
+		printf '%s|%s' "${1}" "${LAST_STATUS_THEME_PROMPT_COLOR-"52"}"
+	fi
 }
 
 function __powerline_prompt_command() {
@@ -289,23 +309,27 @@ function __powerline_prompt_command() {
 	# shellcheck disable=SC2068 # intended behavior
 	for segment in ${POWERLINE_PROMPT[@]-"user_info" "scm" "python_venv" "ruby" "node" "cwd"}; do
 		info="$("__powerline_${segment}_prompt")"
-		[[ -n "${info}" ]] && __powerline_left_segment "${info}"
+		if [[ -n "${info}" ]]; then
+			__powerline_left_segment "${info}"
+		fi
 	done
 
-	[[ "${last_status}" -ne 0 ]] && __powerline_left_segment "$(__powerline_last_status_prompt "${last_status}")"
+	if [[ "${last_status}" -ne 0 ]]; then
+		__powerline_left_segment "$(__powerline_last_status_prompt "${last_status}")"
+	fi
 
-	if [[ -n "${LEFT_PROMPT:-}" ]] && [[ "${POWERLINE_COMPACT_AFTER_LAST_SEGMENT:-0}" -eq 0 ]]; then
+	if [[ -n "${LEFT_PROMPT:-}" && "${POWERLINE_COMPACT_AFTER_LAST_SEGMENT:-0}" -eq 0 ]]; then
 		__powerline_left_last_segment_padding
 	fi
 
 	# By default we try to match the prompt to the adjacent segment's background color,
 	# but when part of the prompt exists within that segment, we instead match the foreground color.
 	prompt_color="$(set_color "${LAST_SEGMENT_COLOR?}" -)"
-	if [[ -n "${LEFT_PROMPT:-}" ]] && [[ -n "${POWERLINE_LEFT_LAST_SEGMENT_PROMPT_CHAR:-}" ]]; then
+	if [[ -n "${LEFT_PROMPT:-}" && -n "${POWERLINE_LEFT_LAST_SEGMENT_PROMPT_CHAR:-}" ]]; then
 		LEFT_PROMPT+="$(set_color - "${LAST_SEGMENT_COLOR?}")${POWERLINE_LEFT_LAST_SEGMENT_PROMPT_CHAR}"
 		prompt_color="${normal?}"
 	fi
-	[[ -n "${LEFT_PROMPT:-}" ]] && LEFT_PROMPT+="${prompt_color}${POWERLINE_PROMPT_CHAR-\\$}${normal?}"
+	LEFT_PROMPT+="${prompt_color}${POWERLINE_PROMPT_CHAR-\\$}${normal?}"
 
 	if [[ "${POWERLINE_COMPACT_PROMPT:-0}" -eq 0 ]]; then
 		LEFT_PROMPT+=" "

From 5ef4b0f8985c52bd4efb9a508b58bb976946b58b Mon Sep 17 00:00:00 2001
From: John D Pell <John+Git@gaelicWizard.net>
Date: Sat, 12 Feb 2022 21:45:54 -0800
Subject: [PATCH 4/9] theme/powerline-base: clean up `user_info` segment

---
 themes/powerline/powerline.base.bash | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/themes/powerline/powerline.base.bash b/themes/powerline/powerline.base.bash
index 45e5efb6..2a40a0db 100644
--- a/themes/powerline/powerline.base.bash
+++ b/themes/powerline/powerline.base.bash
@@ -24,21 +24,15 @@ function __powerline_user_info_prompt() {
 	if [[ "${THEME_CHECK_SUDO:-false}" == true ]]; then
 		if sudo -vn 2> /dev/null; then
 			color=${USER_INFO_THEME_PROMPT_COLOR_SUDO-${POWERLINE_USER_INFO_COLOR_SUDO-"202"}}
+			if [[ "${POWERLINE_PROMPT_USER_INFO_MODE:-}" == "sudo" ]]; then
+				user_info="!"
+			fi
 		fi
 	fi
 
-	case "${POWERLINE_PROMPT_USER_INFO_MODE:-}" in
-		"sudo")
-			if [[ "${color}" == "${USER_INFO_THEME_PROMPT_COLOR_SUDO-${POWERLINE_USER_INFO_COLOR_SUDO-"202"}}" ]]; then
-				user_info="!"
-			fi
-			;;
-		*)
-			if [[ -n "${SSH_CLIENT:-}" || -n "${SSH_CONNECTION:-}" ]]; then
-				user_info="${USER_INFO_SSH_CHAR-${POWERLINE_USER_INFO_SSH_CHAR-"⌁"}}${user_info}"
-			fi
-			;;
-	esac
+	if [[ -n "${SSH_CLIENT:-}" || -n "${SSH_CONNECTION:-}" ]]; then
+		user_info="${USER_INFO_SSH_CHAR-${POWERLINE_USER_INFO_SSH_CHAR-"⌁"}}${user_info}"
+	fi
 	printf '%s|%s' "${user_info}" "${color}"
 }
 

From b16d7efcf5777ba386a6cc121f72790690dfe089 Mon Sep 17 00:00:00 2001
From: John D Pell <John+Git@gaelicWizard.net>
Date: Sat, 12 Feb 2022 22:45:44 -0800
Subject: [PATCH 5/9] theme/powerline-base: harmonize with -multiline a bit

---
 themes/powerline/powerline.base.bash | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/themes/powerline/powerline.base.bash b/themes/powerline/powerline.base.bash
index 2a40a0db..e7ae8ede 100644
--- a/themes/powerline/powerline.base.bash
+++ b/themes/powerline/powerline.base.bash
@@ -249,22 +249,22 @@ function __powerline_left_segment() {
 
 	#for seperator character
 	if [[ "${SEGMENTS_AT_LEFT?}" -eq 0 ]]; then
-		if [[ "${POWERLINE_COMPACT_BEFORE_FIRST_SEGMENT:-0}" -ne 0 ]]; then
+		if [[ "${POWERLINE_COMPACT_BEFORE_FIRST_SEGMENT:-${POWERLINE_COMPACT:-0}}" -ne 0 ]]; then
 			pad_before_segment=""
 		fi
 	else
-		if [[ "${POWERLINE_COMPACT_AFTER_SEPARATOR:-0}" -ne 0 ]]; then
+		if [[ "${POWERLINE_COMPACT_AFTER_SEPARATOR:-${POWERLINE_COMPACT:-0}}" -ne 0 ]]; then
 			pad_before_segment=""
 		fi
 		# Since the previous segment wasn't the last segment, add padding, if needed
 		#
-		if [[ "${POWERLINE_COMPACT_BEFORE_SEPARATOR:-0}" -eq 0 ]]; then
+		if [[ "${POWERLINE_COMPACT_BEFORE_SEPARATOR:-${POWERLINE_COMPACT:-0}}" -eq 0 ]]; then
 			LEFT_PROMPT+="$(set_color - "${LAST_SEGMENT_COLOR?}") ${normal?}"
 		fi
 		if [[ "${LAST_SEGMENT_COLOR?}" -eq "${params[1]:-}" ]]; then
-			LEFT_PROMPT+="$(set_color - "${LAST_SEGMENT_COLOR?}")${POWERLINE_LEFT_SEPARATOR_SOFT:- }${normal?}"
+			LEFT_PROMPT+="$(set_color - "${LAST_SEGMENT_COLOR?}")${POWERLINE_LEFT_SEPARATOR_SOFT- }${normal?}"
 		else
-			LEFT_PROMPT+="$(set_color "${LAST_SEGMENT_COLOR?}" "${params[1]:-}")${POWERLINE_LEFT_SEPARATOR:- }${normal?}"
+			LEFT_PROMPT+="$(set_color "${LAST_SEGMENT_COLOR?}" "${params[1]:-}")${POWERLINE_LEFT_SEPARATOR- }${normal?}"
 		fi
 	fi
 
@@ -287,7 +287,8 @@ function __powerline_last_status_prompt() {
 
 function __powerline_prompt_command() {
 	local last_status="$?" ## always the first
-	local info prompt_color segment
+	local beginning_of_line='\[\e[G\]'
+	local info prompt_color segment prompt
 
 	local LEFT_PROMPT=""
 	local SEGMENTS_AT_LEFT=0
@@ -312,22 +313,22 @@ function __powerline_prompt_command() {
 		__powerline_left_segment "$(__powerline_last_status_prompt "${last_status}")"
 	fi
 
-	if [[ -n "${LEFT_PROMPT:-}" && "${POWERLINE_COMPACT_AFTER_LAST_SEGMENT:-0}" -eq 0 ]]; then
+	if [[ -n "${LEFT_PROMPT:-}" && "${POWERLINE_COMPACT_AFTER_LAST_SEGMENT:-${POWERLINE_COMPACT:-0}}" -eq 0 ]]; then
 		__powerline_left_last_segment_padding
 	fi
 
 	# By default we try to match the prompt to the adjacent segment's background color,
 	# but when part of the prompt exists within that segment, we instead match the foreground color.
 	prompt_color="$(set_color "${LAST_SEGMENT_COLOR?}" -)"
-	if [[ -n "${LEFT_PROMPT:-}" && -n "${POWERLINE_LEFT_LAST_SEGMENT_PROMPT_CHAR:-}" ]]; then
-		LEFT_PROMPT+="$(set_color - "${LAST_SEGMENT_COLOR?}")${POWERLINE_LEFT_LAST_SEGMENT_PROMPT_CHAR}"
+	if [[ -n "${LEFT_PROMPT:-}" && -n "${POWERLINE_LEFT_LAST_SEGMENT_END_CHAR:-}" ]]; then
+		LEFT_PROMPT+="$(set_color - "${LAST_SEGMENT_COLOR?}")${POWERLINE_LEFT_LAST_SEGMENT_END_CHAR}"
 		prompt_color="${normal?}"
 	fi
-	LEFT_PROMPT+="${prompt_color}${POWERLINE_PROMPT_CHAR-\\$}${normal?}"
 
-	if [[ "${POWERLINE_COMPACT_PROMPT:-0}" -eq 0 ]]; then
-		LEFT_PROMPT+=" "
+	prompt="${prompt_color}${PROMPT_CHAR-${POWERLINE_PROMPT_CHAR-\\$}}${normal?}"
+	if [[ "${POWERLINE_COMPACT_PROMPT:-${POWERLINE_COMPACT:-0}}" -eq 0 ]]; then
+		prompt+=" "
 	fi
 
-	PS1="${LEFT_PROMPT?}"
+	PS1="${beginning_of_line}${normal?}${LEFT_PROMPT}${prompt}"
 }

From 6b02cd34b5df2e25c9ecc174ee938a5fcd6f2379 Mon Sep 17 00:00:00 2001
From: John D Pell <John+Git@gaelicWizard.net>
Date: Mon, 17 Jan 2022 13:24:39 -0800
Subject: [PATCH 6/9] theme/powerline-multiline: `shfmt`

---
 .../powerline-multiline.base.bash             | 162 +++++++++---------
 1 file changed, 83 insertions(+), 79 deletions(-)

diff --git a/themes/powerline-multiline/powerline-multiline.base.bash b/themes/powerline-multiline/powerline-multiline.base.bash
index f752bd75..b956cb15 100644
--- a/themes/powerline-multiline/powerline-multiline.base.bash
+++ b/themes/powerline-multiline/powerline-multiline.base.bash
@@ -1,106 +1,110 @@
-. "$BASH_IT/themes/powerline/powerline.base.bash"
+# shellcheck shell=bash
+# shellcheck disable=SC2034 # Expected behavior for themes.
+# shellcheck source-path=SCRIPTDIR/../powerline
+source "${BASH_IT?}/themes/powerline/powerline.base.bash"
 
 function __powerline_last_status_prompt {
-  [[ "$1" -ne 0 ]] && echo "$(set_color ${LAST_STATUS_THEME_PROMPT_COLOR} -) ${1} ${normal}"
+	[[ "$1" -ne 0 ]] && echo "$(set_color ${LAST_STATUS_THEME_PROMPT_COLOR} -) ${1} ${normal}"
 }
 
 function __powerline_right_segment {
-  local OLD_IFS="${IFS}"; IFS="|"
-  local params=( $1 )
-  IFS="${OLD_IFS}"
-  local padding=0
-  local pad_before_segment=" "
+	local OLD_IFS="${IFS}"
+	IFS="|"
+	local params=($1)
+	IFS="${OLD_IFS}"
+	local padding=0
+	local pad_before_segment=" "
 
-  if [[ "${SEGMENTS_AT_RIGHT}" -eq 0 ]]; then
-    if [[ "${POWERLINE_COMPACT_AFTER_LAST_SEGMENT}" -ne 0 ]]; then
-      pad_before_segment=""
-    fi
-    RIGHT_PROMPT+="$(set_color ${params[1]} -)${POWERLINE_RIGHT_END}${normal}"
-    (( padding += 1 ))
-  else
-    if [[ "${POWERLINE_COMPACT_BEFORE_SEPARATOR}" -ne 0 ]]; then
-      pad_before_segment=""
-    fi
-    # Since the previous segment wasn't the last segment, add padding, if needed
-    #
-    if [[ "${POWERLINE_COMPACT_AFTER_SEPARATOR}" -eq 0 ]]; then
-      RIGHT_PROMPT+="$(set_color - ${LAST_SEGMENT_COLOR}) ${normal}"
-      (( padding += 1 ))
-    fi
-    if [[ "${LAST_SEGMENT_COLOR}" -eq "${params[1]}" ]]; then
-      RIGHT_PROMPT+="$(set_color - ${LAST_SEGMENT_COLOR})${POWERLINE_RIGHT_SEPARATOR_SOFT}${normal}"
-    else
-      RIGHT_PROMPT+="$(set_color ${params[1]} ${LAST_SEGMENT_COLOR})${POWERLINE_RIGHT_SEPARATOR}${normal}"
-    fi
-    (( padding += 1 ))
-  fi
+	if [[ "${SEGMENTS_AT_RIGHT}" -eq 0 ]]; then
+		if [[ "${POWERLINE_COMPACT_AFTER_LAST_SEGMENT}" -ne 0 ]]; then
+			pad_before_segment=""
+		fi
+		RIGHT_PROMPT+="$(set_color ${params[1]} -)${POWERLINE_RIGHT_END}${normal}"
+		((padding += 1))
+	else
+		if [[ "${POWERLINE_COMPACT_BEFORE_SEPARATOR}" -ne 0 ]]; then
+			pad_before_segment=""
+		fi
+		# Since the previous segment wasn't the last segment, add padding, if needed
+		#
+		if [[ "${POWERLINE_COMPACT_AFTER_SEPARATOR}" -eq 0 ]]; then
+			RIGHT_PROMPT+="$(set_color - ${LAST_SEGMENT_COLOR}) ${normal}"
+			((padding += 1))
+		fi
+		if [[ "${LAST_SEGMENT_COLOR}" -eq "${params[1]}" ]]; then
+			RIGHT_PROMPT+="$(set_color - ${LAST_SEGMENT_COLOR})${POWERLINE_RIGHT_SEPARATOR_SOFT}${normal}"
+		else
+			RIGHT_PROMPT+="$(set_color ${params[1]} ${LAST_SEGMENT_COLOR})${POWERLINE_RIGHT_SEPARATOR}${normal}"
+		fi
+		((padding += 1))
+	fi
 
-  RIGHT_PROMPT+="$(set_color - ${params[1]})${pad_before_segment}${params[0]}${normal}"
+	RIGHT_PROMPT+="$(set_color - ${params[1]})${pad_before_segment}${params[0]}${normal}"
 
-  (( padding += ${#pad_before_segment} ))
-  (( padding += ${#params[0]} ))
+	((padding += ${#pad_before_segment}))
+	((padding += ${#params[0]}))
 
-  (( RIGHT_PROMPT_LENGTH += padding ))
-  LAST_SEGMENT_COLOR="${params[1]}"
-  (( SEGMENTS_AT_RIGHT += 1 ))
+	((RIGHT_PROMPT_LENGTH += padding))
+	LAST_SEGMENT_COLOR="${params[1]}"
+	((SEGMENTS_AT_RIGHT += 1))
 }
 
 function __powerline_right_first_segment_padding {
-  RIGHT_PROMPT+="$(set_color - ${LAST_SEGMENT_COLOR}) ${normal}"
-  (( RIGHT_PROMPT_LENGTH += 1 ))
+	RIGHT_PROMPT+="$(set_color - ${LAST_SEGMENT_COLOR}) ${normal}"
+	((RIGHT_PROMPT_LENGTH += 1))
 }
 
 function __powerline_prompt_command {
-  local last_status="$?" ## always the first
-  local move_cursor_rightmost='\033[500C'
+	local last_status="$?" ## always the first
+	local move_cursor_rightmost='\033[500C'
 
-  LEFT_PROMPT=""
-  RIGHT_PROMPT=""
-  RIGHT_PROMPT_LENGTH=${POWERLINE_PADDING}
-  SEGMENTS_AT_LEFT=0
-  SEGMENTS_AT_RIGHT=0
-  LAST_SEGMENT_COLOR=""
+	LEFT_PROMPT=""
+	RIGHT_PROMPT=""
+	RIGHT_PROMPT_LENGTH=${POWERLINE_PADDING}
+	SEGMENTS_AT_LEFT=0
+	SEGMENTS_AT_RIGHT=0
+	LAST_SEGMENT_COLOR=""
 
-  _save-and-reload-history "${HISTORY_AUTOSAVE:-0}"
+	_save-and-reload-history "${HISTORY_AUTOSAVE:-0}"
 
-  ## left prompt ##
-  for segment in $POWERLINE_LEFT_PROMPT; do
-    local info="$(__powerline_${segment}_prompt)"
-    [[ -n "${info}" ]] && __powerline_left_segment "${info}"
-  done
+	## left prompt ##
+	for segment in $POWERLINE_LEFT_PROMPT; do
+		local info="$(__powerline_${segment}_prompt)"
+		[[ -n "${info}" ]] && __powerline_left_segment "${info}"
+	done
 
-  if [[ -n "${LEFT_PROMPT}" ]] && [[ "${POWERLINE_COMPACT_AFTER_LAST_SEGMENT}" -eq 0 ]]; then
-    __powerline_left_last_segment_padding
-  fi
+	if [[ -n "${LEFT_PROMPT}" ]] && [[ "${POWERLINE_COMPACT_AFTER_LAST_SEGMENT}" -eq 0 ]]; then
+		__powerline_left_last_segment_padding
+	fi
 
-  [[ -n "${LEFT_PROMPT}" ]] && LEFT_PROMPT+="$(set_color ${LAST_SEGMENT_COLOR} -)${POWERLINE_LEFT_END}${normal}"
+	[[ -n "${LEFT_PROMPT}" ]] && LEFT_PROMPT+="$(set_color ${LAST_SEGMENT_COLOR} -)${POWERLINE_LEFT_END}${normal}"
 
-  ## right prompt ##
-  if [[ -n "${POWERLINE_RIGHT_PROMPT}" ]]; then
-    # LEFT_PROMPT+="${move_cursor_rightmost}"
-    for segment in $POWERLINE_RIGHT_PROMPT; do
-      local info="$(__powerline_${segment}_prompt)"
-      [[ -n "${info}" ]] && __powerline_right_segment "${info}"
-    done
+	## right prompt ##
+	if [[ -n "${POWERLINE_RIGHT_PROMPT}" ]]; then
+		# LEFT_PROMPT+="${move_cursor_rightmost}"
+		for segment in $POWERLINE_RIGHT_PROMPT; do
+			local info="$(__powerline_${segment}_prompt)"
+			[[ -n "${info}" ]] && __powerline_right_segment "${info}"
+		done
 
-    if [[ -n "${RIGHT_PROMPT}" ]] && [[ "${POWERLINE_COMPACT_BEFORE_FIRST_SEGMENT}" -eq 0 ]]; then
-      __powerline_right_first_segment_padding
-    fi
+		if [[ -n "${RIGHT_PROMPT}" ]] && [[ "${POWERLINE_COMPACT_BEFORE_FIRST_SEGMENT}" -eq 0 ]]; then
+			__powerline_right_first_segment_padding
+		fi
 
-    RIGHT_PAD=$(printf "%.s " $(seq 1 $RIGHT_PROMPT_LENGTH))
-    LEFT_PROMPT+="${RIGHT_PAD}${move_cursor_rightmost}"
-    LEFT_PROMPT+="\033[$(( ${#RIGHT_PAD} - 1 ))D"
-  fi
+		RIGHT_PAD=$(printf "%.s " $(seq 1 $RIGHT_PROMPT_LENGTH))
+		LEFT_PROMPT+="${RIGHT_PAD}${move_cursor_rightmost}"
+		LEFT_PROMPT+="\033[$((${#RIGHT_PAD} - 1))D"
+	fi
 
-  local prompt="${PROMPT_CHAR}"
-  if [[ "${POWERLINE_COMPACT_PROMPT}" -eq 0 ]]; then
-    prompt+=" "
-  fi
+	local prompt="${PROMPT_CHAR}"
+	if [[ "${POWERLINE_COMPACT_PROMPT}" -eq 0 ]]; then
+		prompt+=" "
+	fi
 
-  PS1="${LEFT_PROMPT}${RIGHT_PROMPT}\n$(__powerline_last_status_prompt ${last_status})${prompt}"
+	PS1="${LEFT_PROMPT}${RIGHT_PROMPT}\n$(__powerline_last_status_prompt ${last_status})${prompt}"
 
-  ## cleanup ##
-  unset LAST_SEGMENT_COLOR \
-        LEFT_PROMPT RIGHT_PROMPT RIGHT_PROMPT_LENGTH \
-        SEGMENTS_AT_LEFT SEGMENTS_AT_RIGHT
+	## cleanup ##
+	unset LAST_SEGMENT_COLOR \
+		LEFT_PROMPT RIGHT_PROMPT RIGHT_PROMPT_LENGTH \
+		SEGMENTS_AT_LEFT SEGMENTS_AT_RIGHT
 }

From 12046c7cad874232f306e6b7e48888cb087073d7 Mon Sep 17 00:00:00 2001
From: John D Pell <John+Git@gaelicWizard.net>
Date: Mon, 17 Jan 2022 14:03:18 -0800
Subject: [PATCH 7/9] theme/powerline-multiline: harmonize
 `powerline.base.bash` files

---
 themes/powerline-multiline/powerline-multiline.base.bash | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/themes/powerline-multiline/powerline-multiline.base.bash b/themes/powerline-multiline/powerline-multiline.base.bash
index b956cb15..64360e11 100644
--- a/themes/powerline-multiline/powerline-multiline.base.bash
+++ b/themes/powerline-multiline/powerline-multiline.base.bash
@@ -8,12 +8,10 @@ function __powerline_last_status_prompt {
 }
 
 function __powerline_right_segment {
-	local OLD_IFS="${IFS}"
-	IFS="|"
-	local params=($1)
-	IFS="${OLD_IFS}"
-	local padding=0
+	local -a params
+	IFS="|" read -ra params <<< "${1}"
 	local pad_before_segment=" "
+	local padding=0
 
 	if [[ "${SEGMENTS_AT_RIGHT}" -eq 0 ]]; then
 		if [[ "${POWERLINE_COMPACT_AFTER_LAST_SEGMENT}" -ne 0 ]]; then

From fd0e7f4b0c9c3ff9f88943a31de1a7d236074381 Mon Sep 17 00:00:00 2001
From: John D Pell <John+Git@gaelicWizard.net>
Date: Mon, 17 Jan 2022 14:37:42 -0800
Subject: [PATCH 8/9] theme/powerline-multiline: cleanup

---
 clean_files.txt                               |  1 +
 .../powerline-multiline.base.bash             | 79 +++++++++----------
 .../powerline-multiline.theme.bash            | 41 +++++-----
 3 files changed, 61 insertions(+), 60 deletions(-)

diff --git a/clean_files.txt b/clean_files.txt
index 8f9c173a..93cb79b3 100644
--- a/clean_files.txt
+++ b/clean_files.txt
@@ -165,6 +165,7 @@ themes/modern
 themes/norbu
 themes/pete
 themes/powerline
+themes/powerline-multiline
 themes/pure
 themes/purity
 
diff --git a/themes/powerline-multiline/powerline-multiline.base.bash b/themes/powerline-multiline/powerline-multiline.base.bash
index 64360e11..2ccdfd41 100644
--- a/themes/powerline-multiline/powerline-multiline.base.bash
+++ b/themes/powerline-multiline/powerline-multiline.base.bash
@@ -3,11 +3,7 @@
 # shellcheck source-path=SCRIPTDIR/../powerline
 source "${BASH_IT?}/themes/powerline/powerline.base.bash"
 
-function __powerline_last_status_prompt {
-	[[ "$1" -ne 0 ]] && echo "$(set_color ${LAST_STATUS_THEME_PROMPT_COLOR} -) ${1} ${normal}"
-}
-
-function __powerline_right_segment {
+function __powerline_right_segment() {
 	local -a params
 	IFS="|" read -ra params <<< "${1}"
 	local pad_before_segment=" "
@@ -17,92 +13,95 @@ function __powerline_right_segment {
 		if [[ "${POWERLINE_COMPACT_AFTER_LAST_SEGMENT}" -ne 0 ]]; then
 			pad_before_segment=""
 		fi
-		RIGHT_PROMPT+="$(set_color ${params[1]} -)${POWERLINE_RIGHT_END}${normal}"
+		RIGHT_PROMPT+="$(set_color "${params[1]:-}" -)${POWERLINE_RIGHT_END?}${normal?}"
 		((padding += 1))
 	else
-		if [[ "${POWERLINE_COMPACT_BEFORE_SEPARATOR}" -ne 0 ]]; then
+		if [[ "${POWERLINE_COMPACT_BEFORE_SEPARATOR:-}" -ne 0 ]]; then
 			pad_before_segment=""
 		fi
 		# Since the previous segment wasn't the last segment, add padding, if needed
 		#
-		if [[ "${POWERLINE_COMPACT_AFTER_SEPARATOR}" -eq 0 ]]; then
-			RIGHT_PROMPT+="$(set_color - ${LAST_SEGMENT_COLOR}) ${normal}"
+		if [[ "${POWERLINE_COMPACT_AFTER_SEPARATOR:-0}" -eq 0 ]]; then
+			RIGHT_PROMPT+="$(set_color - "${LAST_SEGMENT_COLOR?}") ${normal}"
 			((padding += 1))
 		fi
-		if [[ "${LAST_SEGMENT_COLOR}" -eq "${params[1]}" ]]; then
-			RIGHT_PROMPT+="$(set_color - ${LAST_SEGMENT_COLOR})${POWERLINE_RIGHT_SEPARATOR_SOFT}${normal}"
+		if [[ "${LAST_SEGMENT_COLOR}" -eq "${params[1]:-}" ]]; then
+			RIGHT_PROMPT+="$(set_color - "${LAST_SEGMENT_COLOR?}")${POWERLINE_RIGHT_SEPARATOR_SOFT?}${normal?}"
 		else
-			RIGHT_PROMPT+="$(set_color ${params[1]} ${LAST_SEGMENT_COLOR})${POWERLINE_RIGHT_SEPARATOR}${normal}"
+			RIGHT_PROMPT+="$(set_color "${params[1]:-}" "${LAST_SEGMENT_COLOR?}")${POWERLINE_RIGHT_SEPARATOR?}${normal?}"
 		fi
 		((padding += 1))
 	fi
 
-	RIGHT_PROMPT+="$(set_color - ${params[1]})${pad_before_segment}${params[0]}${normal}"
+	RIGHT_PROMPT+="$(set_color - "${params[1]:-}")${pad_before_segment}${params[0]}${normal?}"
 
 	((padding += ${#pad_before_segment}))
 	((padding += ${#params[0]}))
 
 	((RIGHT_PROMPT_LENGTH += padding))
-	LAST_SEGMENT_COLOR="${params[1]}"
+	LAST_SEGMENT_COLOR="${params[1]:-}"
 	((SEGMENTS_AT_RIGHT += 1))
 }
 
-function __powerline_right_first_segment_padding {
-	RIGHT_PROMPT+="$(set_color - ${LAST_SEGMENT_COLOR}) ${normal}"
+function __powerline_right_first_segment_padding() {
+	RIGHT_PROMPT+="$(set_color - "${LAST_SEGMENT_COLOR?}") ${normal?}"
 	((RIGHT_PROMPT_LENGTH += 1))
 }
 
-function __powerline_prompt_command {
-	local last_status="$?" ## always the first
-	local move_cursor_rightmost='\033[500C'
+function __powerline_last_status_prompt() {
+	[[ "$1" -ne 0 ]] && echo "$(set_color "${LAST_STATUS_THEME_PROMPT_COLOR?}" -) ${1} ${normal?}"
+}
 
-	LEFT_PROMPT=""
-	RIGHT_PROMPT=""
-	RIGHT_PROMPT_LENGTH=${POWERLINE_PADDING}
-	SEGMENTS_AT_LEFT=0
-	SEGMENTS_AT_RIGHT=0
-	LAST_SEGMENT_COLOR=""
+function __powerline_prompt_command() {
+	local last_status="$?" ## always the first
+	local move_cursor_rightmost='\033[500C' info prompt
+
+	local LEFT_PROMPT=""
+	local RIGHT_PROMPT=""
+	local RIGHT_PROMPT_LENGTH=${POWERLINE_PADDING?}
+	local SEGMENTS_AT_LEFT=0
+	local SEGMENTS_AT_RIGHT=0
+	local LAST_SEGMENT_COLOR=""
 
 	_save-and-reload-history "${HISTORY_AUTOSAVE:-0}"
 
+	if [[ -n "${POWERLINE_PROMPT_DISTRO_LOGO:-}" ]]; then
+		LEFT_PROMPT+="$(set_color "${PROMPT_DISTRO_LOGO_COLOR?}" "${PROMPT_DISTRO_LOGO_COLORBG?}")${PROMPT_DISTRO_LOGO?}$(set_color - -)"
+	fi
+
 	## left prompt ##
-	for segment in $POWERLINE_LEFT_PROMPT; do
-		local info="$(__powerline_${segment}_prompt)"
+	for segment in ${POWERLINE_PROMPT-"user_info scm python_venv ruby node cwd"}; do
+		info="$("__powerline_${segment}_prompt")"
 		[[ -n "${info}" ]] && __powerline_left_segment "${info}"
 	done
 
-	if [[ -n "${LEFT_PROMPT}" ]] && [[ "${POWERLINE_COMPACT_AFTER_LAST_SEGMENT}" -eq 0 ]]; then
+	if [[ -n "${LEFT_PROMPT:-}" ]] && [[ "${POWERLINE_COMPACT_AFTER_LAST_SEGMENT:-0}" -eq 0 ]]; then
 		__powerline_left_last_segment_padding
 	fi
 
-	[[ -n "${LEFT_PROMPT}" ]] && LEFT_PROMPT+="$(set_color ${LAST_SEGMENT_COLOR} -)${POWERLINE_LEFT_END}${normal}"
+	[[ -n "${LEFT_PROMPT:-}" ]] && LEFT_PROMPT+="$(set_color "${LAST_SEGMENT_COLOR?}" -)${POWERLINE_LEFT_END?}${normal?}"
 
 	## right prompt ##
 	if [[ -n "${POWERLINE_RIGHT_PROMPT}" ]]; then
 		# LEFT_PROMPT+="${move_cursor_rightmost}"
 		for segment in $POWERLINE_RIGHT_PROMPT; do
-			local info="$(__powerline_${segment}_prompt)"
+			info="$("__powerline_${segment}_prompt")"
 			[[ -n "${info}" ]] && __powerline_right_segment "${info}"
 		done
 
-		if [[ -n "${RIGHT_PROMPT}" ]] && [[ "${POWERLINE_COMPACT_BEFORE_FIRST_SEGMENT}" -eq 0 ]]; then
+		if [[ -n "${RIGHT_PROMPT:-}" ]] && [[ "${POWERLINE_COMPACT_BEFORE_FIRST_SEGMENT:-0}" -eq 0 ]]; then
 			__powerline_right_first_segment_padding
 		fi
 
-		RIGHT_PAD=$(printf "%.s " $(seq 1 $RIGHT_PROMPT_LENGTH))
+		RIGHT_PAD=$(printf "%.s " $(seq 1 "${RIGHT_PROMPT_LENGTH}"))
 		LEFT_PROMPT+="${RIGHT_PAD}${move_cursor_rightmost}"
 		LEFT_PROMPT+="\033[$((${#RIGHT_PAD} - 1))D"
 	fi
 
-	local prompt="${PROMPT_CHAR}"
-	if [[ "${POWERLINE_COMPACT_PROMPT}" -eq 0 ]]; then
+	prompt="${PROMPT_CHAR?}"
+	if [[ "${POWERLINE_COMPACT_PROMPT:-0}" -eq 0 ]]; then
 		prompt+=" "
 	fi
 
-	PS1="${LEFT_PROMPT}${RIGHT_PROMPT}\n$(__powerline_last_status_prompt ${last_status})${prompt}"
-
-	## cleanup ##
-	unset LAST_SEGMENT_COLOR \
-		LEFT_PROMPT RIGHT_PROMPT RIGHT_PROMPT_LENGTH \
-		SEGMENTS_AT_LEFT SEGMENTS_AT_RIGHT
+	PS1="${LEFT_PROMPT}${RIGHT_PROMPT}\n$(__powerline_last_status_prompt "${last_status}")${prompt}"
 }
diff --git a/themes/powerline-multiline/powerline-multiline.theme.bash b/themes/powerline-multiline/powerline-multiline.theme.bash
index 48a1243e..aa8c52cd 100644
--- a/themes/powerline-multiline/powerline-multiline.theme.bash
+++ b/themes/powerline-multiline/powerline-multiline.theme.bash
@@ -1,22 +1,23 @@
-#!/usr/bin/env bash
-
-. "$BASH_IT/themes/powerline-multiline/powerline-multiline.base.bash"
+# shellcheck shell=bash
+# shellcheck disable=SC2034 # Expected behavior for themes.
+# shellcheck source-path=SCRIPTDIR/../powerline-multiline
+source "${BASH_IT?}/themes/powerline-multiline/powerline-multiline.base.bash"
 
 PROMPT_CHAR=${POWERLINE_PROMPT_CHAR:="❯"}
-POWERLINE_LEFT_SEPARATOR=${POWERLINE_LEFT_SEPARATOR:=""}
-POWERLINE_LEFT_SEPARATOR_SOFT=${POWERLINE_LEFT_SEPARATOR_SOFT:=""}
-POWERLINE_RIGHT_SEPARATOR=${POWERLINE_RIGHT_SEPARATOR:=""}
-POWERLINE_RIGHT_SEPARATOR_SOFT=${POWERLINE_RIGHT_SEPARATOR_SOFT:=""}
-POWERLINE_LEFT_END=${POWERLINE_LEFT_END:=""}
-POWERLINE_RIGHT_END=${POWERLINE_RIGHT_END:=""}
-POWERLINE_PADDING=${POWERLINE_PADDING:=2}
+: "${POWERLINE_LEFT_SEPARATOR:=""}"
+: "${POWERLINE_LEFT_SEPARATOR_SOFT:=""}"
+: "${POWERLINE_RIGHT_SEPARATOR:=""}"
+: "${POWERLINE_RIGHT_SEPARATOR_SOFT:=""}"
+: "${POWERLINE_LEFT_END:=""}"
+: "${POWERLINE_RIGHT_END:=""}"
+: "${POWERLINE_PADDING:=2}"
 
-POWERLINE_COMPACT=${POWERLINE_COMPACT:=0}
-POWERLINE_COMPACT_BEFORE_SEPARATOR=${POWERLINE_COMPACT_BEFORE_SEPARATOR:=${POWERLINE_COMPACT}}
-POWERLINE_COMPACT_AFTER_SEPARATOR=${POWERLINE_COMPACT_AFTER_SEPARATOR:=${POWERLINE_COMPACT}}
-POWERLINE_COMPACT_BEFOR_FIRST_SEGMENT=${POWERLINE_COMPACT_BEFORE_FIRST_SEGMENT:=${POWERLINE_COMPACT}}
-POWERLINE_COMPACT_AFTER_LAST_SEGMENT=${POWERLINE_COMPACT_AFTER_LAST_SEGMENT:=${POWERLINE_COMPACT}}
-POWERLINE_COMPACT_PROMPT=${POWERLINE_COMPACT_PROMPT:=${POWERLINE_COMPACT}}
+: "${POWERLINE_COMPACT:=0}"
+: "${POWERLINE_COMPACT_BEFORE_SEPARATOR:=${POWERLINE_COMPACT}}"
+: "${POWERLINE_COMPACT_AFTER_SEPARATOR:=${POWERLINE_COMPACT}}"
+: "${POWERLINE_COMPACT_BEFORE_FIRST_SEGMENT:=${POWERLINE_COMPACT}}"
+: "${POWERLINE_COMPACT_AFTER_LAST_SEGMENT:=${POWERLINE_COMPACT}}"
+: "${POWERLINE_COMPACT_PROMPT:=${POWERLINE_COMPACT}}"
 
 USER_INFO_SSH_CHAR=${POWERLINE_USER_INFO_SSH_CHAR:=" "}
 USER_INFO_THEME_PROMPT_COLOR=${POWERLINE_USER_INFO_COLOR:=32}
@@ -67,12 +68,12 @@ LAST_STATUS_THEME_PROMPT_COLOR=${POWERLINE_LAST_STATUS_COLOR:=196}
 
 CLOCK_THEME_PROMPT_COLOR=${POWERLINE_CLOCK_COLOR:=240}
 
-BATTERY_AC_CHAR=${BATTERY_AC_CHAR:="⚡"}
+: "${BATTERY_AC_CHAR:="⚡"}"
 BATTERY_STATUS_THEME_PROMPT_GOOD_COLOR=${POWERLINE_BATTERY_GOOD_COLOR:=70}
 BATTERY_STATUS_THEME_PROMPT_LOW_COLOR=${POWERLINE_BATTERY_LOW_COLOR:=208}
 BATTERY_STATUS_THEME_PROMPT_CRITICAL_COLOR=${POWERLINE_BATTERY_CRITICAL_COLOR:=160}
 
-THEME_CLOCK_FORMAT=${THEME_CLOCK_FORMAT:="%H:%M:%S"}
+: "${THEME_CLOCK_FORMAT:="%H:%M:%S"}"
 
 IN_VIM_THEME_PROMPT_COLOR=${POWERLINE_IN_VIM_COLOR:=245}
 IN_VIM_THEME_PROMPT_TEXT=${POWERLINE_IN_VIM_TEXT:="vim"}
@@ -99,7 +100,7 @@ GCLOUD_CHAR=${POWERLINE_GCLOUD_CHAR:="❲G❳ "}
 
 COMMAND_DURATION_PROMPT_COLOR=${POWERLINE_COMMAND_DURATION_COLOR:=129}
 
-POWERLINE_LEFT_PROMPT=${POWERLINE_LEFT_PROMPT:="scm python_venv ruby node cwd"}
-POWERLINE_RIGHT_PROMPT=${POWERLINE_RIGHT_PROMPT:="in_vim clock battery user_info"}
+: "${POWERLINE_LEFT_PROMPT:="scm python_venv ruby node cwd"}"
+: "${POWERLINE_RIGHT_PROMPT:="in_vim clock battery user_info"}"
 
 safe_append_prompt_command __powerline_prompt_command

From 5956ea2f8c78ed6da18079cd75f61a0ffa8f9f77 Mon Sep 17 00:00:00 2001
From: John D Pell <John+Git@gaelicWizard.net>
Date: Sat, 12 Feb 2022 22:44:41 -0800
Subject: [PATCH 9/9] theme/powerline-multiline: cleanup

---
 .../powerline-multiline.base.bash             | 48 ++++++++++++-------
 .../powerline-multiline.theme.bash            |  4 +-
 2 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/themes/powerline-multiline/powerline-multiline.base.bash b/themes/powerline-multiline/powerline-multiline.base.bash
index 2ccdfd41..68af8f25 100644
--- a/themes/powerline-multiline/powerline-multiline.base.bash
+++ b/themes/powerline-multiline/powerline-multiline.base.bash
@@ -10,10 +10,10 @@ function __powerline_right_segment() {
 	local padding=0
 
 	if [[ "${SEGMENTS_AT_RIGHT}" -eq 0 ]]; then
-		if [[ "${POWERLINE_COMPACT_AFTER_LAST_SEGMENT}" -ne 0 ]]; then
+		if [[ "${POWERLINE_COMPACT_AFTER_LAST_SEGMENT:-${POWERLINE_COMPACT:-0}}" -ne 0 ]]; then
 			pad_before_segment=""
 		fi
-		RIGHT_PROMPT+="$(set_color "${params[1]:-}" -)${POWERLINE_RIGHT_END?}${normal?}"
+		RIGHT_PROMPT+="$(set_color "${params[1]:-}" -)${POWERLINE_RIGHT_LAST_SEGMENT_END_CHAR:-}${normal?}"
 		((padding += 1))
 	else
 		if [[ "${POWERLINE_COMPACT_BEFORE_SEPARATOR:-}" -ne 0 ]]; then
@@ -26,9 +26,9 @@ function __powerline_right_segment() {
 			((padding += 1))
 		fi
 		if [[ "${LAST_SEGMENT_COLOR}" -eq "${params[1]:-}" ]]; then
-			RIGHT_PROMPT+="$(set_color - "${LAST_SEGMENT_COLOR?}")${POWERLINE_RIGHT_SEPARATOR_SOFT?}${normal?}"
+			RIGHT_PROMPT+="$(set_color - "${LAST_SEGMENT_COLOR?}")${POWERLINE_RIGHT_SEPARATOR_SOFT- }${normal?}"
 		else
-			RIGHT_PROMPT+="$(set_color "${params[1]:-}" "${LAST_SEGMENT_COLOR?}")${POWERLINE_RIGHT_SEPARATOR?}${normal?}"
+			RIGHT_PROMPT+="$(set_color "${params[1]:-}" "${LAST_SEGMENT_COLOR?}")${POWERLINE_RIGHT_SEPARATOR- }${normal?}"
 		fi
 		((padding += 1))
 	fi
@@ -49,16 +49,20 @@ function __powerline_right_first_segment_padding() {
 }
 
 function __powerline_last_status_prompt() {
-	[[ "$1" -ne 0 ]] && echo "$(set_color "${LAST_STATUS_THEME_PROMPT_COLOR?}" -) ${1} ${normal?}"
+	if [[ "${1?}" -ne 0 ]]; then
+		printf '%b %s %b' "$(set_color "${LAST_STATUS_THEME_PROMPT_COLOR-"52"}" -)" "${1}" "${normal?}"
+	fi
 }
 
 function __powerline_prompt_command() {
 	local last_status="$?" ## always the first
-	local move_cursor_rightmost='\033[500C' info prompt
+	local beginning_of_line='\[\e[G\]'
+	local move_cursor_rightmost='\e[500C'
+	local info prompt_color segment prompt
 
 	local LEFT_PROMPT=""
 	local RIGHT_PROMPT=""
-	local RIGHT_PROMPT_LENGTH=${POWERLINE_PADDING?}
+	local RIGHT_PROMPT_LENGTH=${POWERLINE_PADDING:-2}
 	local SEGMENTS_AT_LEFT=0
 	local SEGMENTS_AT_RIGHT=0
 	local LAST_SEGMENT_COLOR=""
@@ -70,26 +74,36 @@ function __powerline_prompt_command() {
 	fi
 
 	## left prompt ##
-	for segment in ${POWERLINE_PROMPT-"user_info scm python_venv ruby node cwd"}; do
+	# shellcheck disable=SC2068 # intended behavior
+	for segment in ${POWERLINE_PROMPT[@]-"user_info" "scm" "python_venv" "ruby" "node" "cwd"}; do
 		info="$("__powerline_${segment}_prompt")"
-		[[ -n "${info}" ]] && __powerline_left_segment "${info}"
+		if [[ -n "${info}" ]]; then
+			__powerline_left_segment "${info}"
+		fi
 	done
 
-	if [[ -n "${LEFT_PROMPT:-}" ]] && [[ "${POWERLINE_COMPACT_AFTER_LAST_SEGMENT:-0}" -eq 0 ]]; then
+	if [[ -n "${LEFT_PROMPT:-}" && "${POWERLINE_COMPACT_AFTER_LAST_SEGMENT:-${POWERLINE_COMPACT:-0}}" -eq 0 ]]; then
 		__powerline_left_last_segment_padding
 	fi
 
-	[[ -n "${LEFT_PROMPT:-}" ]] && LEFT_PROMPT+="$(set_color "${LAST_SEGMENT_COLOR?}" -)${POWERLINE_LEFT_END?}${normal?}"
+	# By default we try to match the prompt to the adjacent segment's background color,
+	# but when part of the prompt exists within that segment, we instead match the foreground color.
+	prompt_color="$(set_color "${LAST_SEGMENT_COLOR?}" -)"
+	if [[ -n "${LEFT_PROMPT:-}" && -n "${POWERLINE_LEFT_LAST_SEGMENT_END_CHAR:-}" ]]; then
+		LEFT_PROMPT+="$(set_color - "${LAST_SEGMENT_COLOR?}")${POWERLINE_LEFT_LAST_SEGMENT_END_CHAR}"
+		prompt_color="${normal?}"
+	fi
 
 	## right prompt ##
-	if [[ -n "${POWERLINE_RIGHT_PROMPT}" ]]; then
+	if [[ -n "${POWERLINE_RIGHT_PROMPT[*]:-}" ]]; then
 		# LEFT_PROMPT+="${move_cursor_rightmost}"
-		for segment in $POWERLINE_RIGHT_PROMPT; do
+		# shellcheck disable=SC2068 # intended behavior
+		for segment in ${POWERLINE_RIGHT_PROMPT[@]}; do
 			info="$("__powerline_${segment}_prompt")"
 			[[ -n "${info}" ]] && __powerline_right_segment "${info}"
 		done
 
-		if [[ -n "${RIGHT_PROMPT:-}" ]] && [[ "${POWERLINE_COMPACT_BEFORE_FIRST_SEGMENT:-0}" -eq 0 ]]; then
+		if [[ -n "${RIGHT_PROMPT:-}" && "${POWERLINE_COMPACT_BEFORE_FIRST_SEGMENT:-${POWERLINE_COMPACT:-0}}" -eq 0 ]]; then
 			__powerline_right_first_segment_padding
 		fi
 
@@ -98,10 +112,10 @@ function __powerline_prompt_command() {
 		LEFT_PROMPT+="\033[$((${#RIGHT_PAD} - 1))D"
 	fi
 
-	prompt="${PROMPT_CHAR?}"
-	if [[ "${POWERLINE_COMPACT_PROMPT:-0}" -eq 0 ]]; then
+	prompt="${prompt_color}${PROMPT_CHAR-${POWERLINE_PROMPT_CHAR-\\$}}${normal?}"
+	if [[ "${POWERLINE_COMPACT_PROMPT:-${POWERLINE_COMPACT:-0}}" -eq 0 ]]; then
 		prompt+=" "
 	fi
 
-	PS1="${LEFT_PROMPT}${RIGHT_PROMPT}\n$(__powerline_last_status_prompt "${last_status}")${prompt}"
+	PS1="${beginning_of_line}${normal?}${LEFT_PROMPT}${RIGHT_PROMPT}\n$(__powerline_last_status_prompt "${last_status}")${prompt}"
 }
diff --git a/themes/powerline-multiline/powerline-multiline.theme.bash b/themes/powerline-multiline/powerline-multiline.theme.bash
index aa8c52cd..a96c6f78 100644
--- a/themes/powerline-multiline/powerline-multiline.theme.bash
+++ b/themes/powerline-multiline/powerline-multiline.theme.bash
@@ -8,8 +8,8 @@ PROMPT_CHAR=${POWERLINE_PROMPT_CHAR:="❯"}
 : "${POWERLINE_LEFT_SEPARATOR_SOFT:=""}"
 : "${POWERLINE_RIGHT_SEPARATOR:=""}"
 : "${POWERLINE_RIGHT_SEPARATOR_SOFT:=""}"
-: "${POWERLINE_LEFT_END:=""}"
-: "${POWERLINE_RIGHT_END:=""}"
+: "${POWERLINE_LEFT_LAST_SEGMENT_END_CHAR:=""}"
+: "${POWERLINE_RIGHT_LAST_SEGMENT_END_CHAR:=""}"
 : "${POWERLINE_PADDING:=2}"
 
 : "${POWERLINE_COMPACT:=0}"