-
Notifications
You must be signed in to change notification settings - Fork 2.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2028 from gaelicWizard/plugin/base
lib/appearance: export `$CLICOLOR` instead of `$LSCOLOR`
- Loading branch information
Showing
3 changed files
with
15 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,19 +1,18 @@ | ||
#!/usr/bin/env bash | ||
# shellcheck shell=bash | ||
|
||
# colored ls | ||
export LSCOLORS='Gxfxcxdxdxegedabagacad' | ||
: "${CLICOLOR:=$(tput colors)}" | ||
export CLICOLOR | ||
|
||
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 | ||
# shellcheck disable=SC1090 | ||
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters