Merge pull request #1200 from nwinkler/shellcheck-fixes

Shellcheck fixes
This commit is contained in:
Nils Winkler
2018-06-01 08:22:44 +02:00
committed by GitHub
2 changed files with 14 additions and 13 deletions

View File

@@ -4,18 +4,19 @@
# Only set $BASH_IT if it's not already set
if [ -z "$BASH_IT" ];
then
# Setting $BASH to maintain backwards compatibility
# TODO: warn users that they should upgrade their .bash_profile
export BASH_IT=$BASH
export BASH="$(bash -c 'echo $BASH')"
# Setting $BASH to maintain backwards compatibility
# TODO: warn users that they should upgrade their .bash_profile
export BASH_IT=$BASH
BASH="$(bash -c 'echo $BASH')"
export BASH
fi
# For backwards compatibility, look in old BASH_THEME location
if [ -z "$BASH_IT_THEME" ];
then
# TODO: warn users that they should upgrade their .bash_profile
export BASH_IT_THEME="$BASH_THEME";
unset $BASH_THEME;
# TODO: warn users that they should upgrade their .bash_profile
export BASH_IT_THEME="$BASH_THEME";
unset BASH_THEME;
fi
# Load composure first, so we support function metadata
@@ -30,9 +31,9 @@ LIB="${BASH_IT}/lib/*.bash"
APPEARANCE_LIB="${BASH_IT}/lib/appearance.bash"
for config_file in $LIB
do
if [ $config_file != $APPEARANCE_LIB ]; then
if [ "$config_file" != "$APPEARANCE_LIB" ]; then
# shellcheck disable=SC1090
source $config_file
source "$config_file"
fi
done
@@ -57,7 +58,7 @@ source "${BASH_IT}/themes/base.theme.bash"
# appearance (themes) now, after all dependencies
# shellcheck source=./lib/appearance.bash
source $APPEARANCE_LIB
source "$APPEARANCE_LIB"
# Load custom aliases, completion, plugins
for file_type in "aliases" "completion" "plugins"
@@ -75,13 +76,13 @@ for config_file in $CUSTOM
do
if [ -e "${config_file}" ]; then
# shellcheck disable=SC1090
source $config_file
source "$config_file"
fi
done
unset config_file
if [[ $PROMPT ]]; then
export PS1="\[""$PROMPT""\]"
export PS1="\[""$PROMPT""\]"
fi
# Adding Support for other OSes

View File

@@ -16,7 +16,7 @@ esac
BACKUP_FILE=$CONFIG_FILE.bak
if [ ! -e "$HOME/$BACKUP_FILE" ]; then
echo -e "\033[0;33mBackup file "$HOME/$BACKUP_FILE" not found.\033[0m" >&2
echo -e "\033[0;33mBackup file $HOME/$BACKUP_FILE not found.\033[0m" >&2
test -w "$HOME/$CONFIG_FILE" &&
mv "$HOME/$CONFIG_FILE" "$HOME/$CONFIG_FILE.uninstall" &&