From eadd2685dfb800f12d633370b8814a34c5afff5b Mon Sep 17 00:00:00 2001 From: BarbUk Date: Sat, 16 Jan 2021 09:12:59 +0100 Subject: [PATCH] Clean bobby --- themes/bobby-python/bobby-python.theme.bash | 17 ++++++++------- themes/bobby/bobby.theme.bash | 24 ++++++++++----------- 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/themes/bobby-python/bobby-python.theme.bash b/themes/bobby-python/bobby-python.theme.bash index 7aaea4e8..9144e251 100644 --- a/themes/bobby-python/bobby-python.theme.bash +++ b/themes/bobby-python/bobby-python.theme.bash @@ -1,4 +1,5 @@ -#!/usr/bin/env bash +# shellcheck shell=bash + SCM_THEME_PROMPT_DIRTY=" ${red}✗" SCM_THEME_PROMPT_CLEAN=" ${bold_green}✓" SCM_THEME_PROMPT_PREFIX=" |" @@ -12,13 +13,13 @@ GIT_THEME_PROMPT_SUFFIX="${green}|" CONDAENV_THEME_PROMPT_SUFFIX="|" function prompt_command() { - PS1="\n${yellow}$(python_version_prompt) " # Name of virtual env followed by python version - PS1+="${purple}\h " - PS1+="${reset_color}in " - PS1+="${green}\w\n" - PS1+="${bold_cyan}$(scm_char)" - PS1+="${green}$(scm_prompt_info) " - PS1+="${green}→${reset_color} " + PS1="\n${yellow}$(python_version_prompt) " # Name of virtual env followed by python version + PS1+="${purple}\h " + PS1+="${reset_color}in " + PS1+="${green}\w\n" + PS1+="${bold_cyan}$(scm_char)" + PS1+="${green}$(scm_prompt_info) " + PS1+="${green}→${reset_color} " } safe_append_prompt_command prompt_command diff --git a/themes/bobby/bobby.theme.bash b/themes/bobby/bobby.theme.bash index 6470354a..bdf388f7 100644 --- a/themes/bobby/bobby.theme.bash +++ b/themes/bobby/bobby.theme.bash @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +# shellcheck shell=bash SCM_THEME_PROMPT_DIRTY=" ${red}✗" SCM_THEME_PROMPT_CLEAN=" ${bold_green}✓" @@ -14,21 +14,21 @@ RVM_THEME_PROMPT_PREFIX="|" RVM_THEME_PROMPT_SUFFIX="|" __bobby_clock() { - printf "$(clock_prompt) " + printf '%s' "$(clock_prompt) " - if [ "${THEME_SHOW_CLOCK_CHAR}" == "true" ]; then - printf "$(clock_char) " - fi + if [ "${THEME_SHOW_CLOCK_CHAR}" == "true" ]; then + printf '%s' "$(clock_char) " + fi } function prompt_command() { - PS1="\n$(battery_char) $(__bobby_clock)" - PS1+="${yellow}$(ruby_version_prompt) " - PS1+="${purple}\h " - PS1+="${reset_color}in " - PS1+="${green}\w\n" - PS1+="${bold_cyan}$(scm_prompt_char_info) " - PS1+="${green}→${reset_color} " + PS1="\n$(battery_char) $(__bobby_clock)" + PS1+="${yellow}$(ruby_version_prompt) " + PS1+="${purple}\h " + PS1+="${reset_color}in " + PS1+="${green}\w\n" + PS1+="${bold_cyan}$(scm_prompt_char_info) " + PS1+="${green}→${reset_color} " } THEME_SHOW_CLOCK_CHAR=${THEME_SHOW_CLOCK_CHAR:-"true"}