Merge pull request #2035 from gaelicWizard/theme/pete

theme/pete: `shellcheck` && `shfmt`
Bash-it · Jan 24, 2022 · dbb3ea4 · dbb3ea4
2 parents edc3679 + 8e8fe69
commit dbb3ea4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/clean_files.txt b/clean_files.txt
@@ -153,6 +153,7 @@ themes/command_duration.theme.bash
 themes/easy
 themes/essential
 themes/modern
+themes/pete
 themes/powerline
 themes/pure
 themes/purity

diff --git a/themes/pete/pete.theme.bash b/themes/pete/pete.theme.bash
@@ -1,11 +1,16 @@
 # shellcheck shell=bash
+# shellcheck disable=SC2034 # Expected behavior for themes.
 
-prompt_setter() {
-  # Save history
-  _save-and-reload-history 1
-  PS1="($(clock_prompt)) $(scm_char) [$blue\u$reset_color@$green\H$reset_color] $yellow\w${reset_color}$(scm_prompt_info)$(ruby_version_prompt) $reset_color "
-  PS2='> '
-  PS4='+ '
+function prompt_setter() {
+	local clock_prompt scm_char scm_prompt_info ruby_version_prompt
+	clock_prompt="$(clock_prompt)"
+	scm_char="$(scm_char)"
+	scm_prompt_info="$(scm_prompt_info)"
+	ruby_version_prompt="$(ruby_version_prompt)"
+	_save-and-reload-history 1 # Save history
+	PS1="(${clock_prompt}) ${scm_char} [${blue?}\u${reset_color?}@${green?}\H${reset_color?}] ${yellow?}\w${reset_color?}${scm_prompt_info}${ruby_version_prompt} ${reset_color?} "
+	PS2='> '
+	PS4='+ '
 }
 
 safe_append_prompt_command prompt_setter