From 8087e7af49886aeb5cdb28d3f1a04093aac75453 Mon Sep 17 00:00:00 2001 From: cornfeedhobo Date: Sun, 3 Jan 2021 23:19:53 -0600 Subject: [PATCH] linting clean up --- clean_files.txt | 4 ++++ lib/appearance.bash | 19 ++++++++++--------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/clean_files.txt b/clean_files.txt index f70503f6..9088a1fb 100644 --- a/clean_files.txt +++ b/clean_files.txt @@ -24,6 +24,10 @@ docs bash_it.sh lint_clean_files.sh +# libs +# +lib/appearance.bash + # themes # themes/90210 diff --git a/lib/appearance.bash b/lib/appearance.bash index 6d0ef2ff..2afbecb2 100644 --- a/lib/appearance.bash +++ b/lib/appearance.bash @@ -1,19 +1,20 @@ #!/usr/bin/env 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" + CUSTOM_THEME_DIR="${BASH_IT_CUSTOM:=${BASH_IT}/custom}/themes" fi # 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 [[ "$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