From 3fd1c02c45e49d7f157f16ed6aba677ff300dc90 Mon Sep 17 00:00:00 2001 From: John D Pell Date: Sun, 19 Sep 2021 00:11:21 -0700 Subject: [PATCH] lib/theme: Fix a *few* SC2154 These variables are referenced by themes already linted. --- themes/base.theme.bash | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/themes/base.theme.bash b/themes/base.theme.bash index 1e0409d3ea..8dc9186251 100644 --- a/themes/base.theme.bash +++ b/themes/base.theme.bash @@ -427,7 +427,7 @@ function rbenv_version_prompt { } function rbfu_version_prompt { - if [[ $RBFU_RUBY_VERSION ]]; then + if [[ -n "${RBFU_RUBY_VERSION:-}" ]]; then echo -e "${RBFU_THEME_PROMPT_PREFIX}${RBFU_RUBY_VERSION}${RBFU_THEME_PROMPT_SUFFIX}" fi } @@ -462,8 +462,8 @@ function k8s_namespace_prompt { } function virtualenv_prompt { - if [[ -n "$VIRTUAL_ENV" ]]; then - virtualenv=$(basename "$VIRTUAL_ENV") + if [[ -n "${VIRTUAL_ENV:-}" ]]; then + virtualenv="${VIRTUAL_ENV##*/}" echo -e "$VIRTUALENV_THEME_PROMPT_PREFIX$virtualenv$VIRTUALENV_THEME_PROMPT_SUFFIX" fi } @@ -504,7 +504,7 @@ function clock_char { function clock_prompt { CLOCK_COLOR=${THEME_CLOCK_COLOR:-"$normal"} CLOCK_FORMAT=${THEME_CLOCK_FORMAT:-"%H:%M:%S"} - [ -z "$THEME_SHOW_CLOCK" ] && THEME_SHOW_CLOCK=${THEME_CLOCK_CHECK:-"true"} + [[ -z "${THEME_SHOW_CLOCK:-}" ]] && THEME_SHOW_CLOCK=${THEME_CLOCK_CHECK:-"true"} SHOW_CLOCK=$THEME_SHOW_CLOCK if [[ "${SHOW_CLOCK}" = "true" ]]; then