From 08217d74bc2c5b2a27dc17deba8c5657a7b9352c Mon Sep 17 00:00:00 2001 From: John D Pell Date: Mon, 20 Sep 2021 14:01:27 -0700 Subject: [PATCH] lib/appearance: `shellcheck` && `shfmt` --- clean_files.txt | 1 + lib/appearance.bash | 23 +++++++++++------------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/clean_files.txt b/clean_files.txt index 9ddfb403..045591fc 100644 --- a/clean_files.txt +++ b/clean_files.txt @@ -77,6 +77,7 @@ completion/available/vuejs.completion.bash completion/available/wpscan.completion.bash # libraries +lib/appearance.bash lib/helpers.bash lib/log.bash lib/search.bash diff --git a/lib/appearance.bash b/lib/appearance.bash index 6d0ef2ff..080b007f 100644 --- a/lib/appearance.bash +++ b/lib/appearance.bash @@ -1,19 +1,18 @@ -#!/usr/bin/env bash +# shellcheck shell=bash +# shellcheck disable=SC1090 # colored ls export LSCOLORS='Gxfxcxdxdxegedabagacad' -if [[ -z "$CUSTOM_THEME_DIR" ]]; then - CUSTOM_THEME_DIR="${BASH_IT_CUSTOM:=${BASH_IT}/custom}/themes" -fi +: "${CUSTOM_THEME_DIR:="${BASH_IT_CUSTOM:=${BASH_IT}/custom}/themes"}" # Load the theme -if [[ $BASH_IT_THEME ]]; then - if [[ -f $BASH_IT_THEME ]]; then - source $BASH_IT_THEME - elif [[ -f "$CUSTOM_THEME_DIR/$BASH_IT_THEME/$BASH_IT_THEME.theme.bash" ]]; then - source "$CUSTOM_THEME_DIR/$BASH_IT_THEME/$BASH_IT_THEME.theme.bash" - else - source "$BASH_IT/themes/$BASH_IT_THEME/$BASH_IT_THEME.theme.bash" - fi +if [[ -n "${BASH_IT_THEME:-}" ]]; then + if [[ -f "${BASH_IT_THEME}" ]]; then + source "${BASH_IT_THEME}" + elif [[ -f "$CUSTOM_THEME_DIR/$BASH_IT_THEME/$BASH_IT_THEME.theme.bash" ]]; then + source "$CUSTOM_THEME_DIR/$BASH_IT_THEME/$BASH_IT_THEME.theme.bash" + else + source "$BASH_IT/themes/$BASH_IT_THEME/$BASH_IT_THEME.theme.bash" + fi fi