XorA
/
bash-it
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed some more shellcheck complaints

pull/1043/head
Nils Winkler 2017-09-15 08:10:16 +02:00
parent 0791895236
commit 2acb87e882
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bash_it.sh
View File

@ -29,6 +29,7 @@ then
fi fi
# Load composure first, so we support function metadata # Load composure first, so we support function metadata
# shellcheck source=./lib/composure.bash
source "${BASH_IT}/lib/composure.bash" source "${BASH_IT}/lib/composure.bash"
# support 'plumbing' metadata # support 'plumbing' metadata
@ -40,6 +41,7 @@ APPEARANCE_LIB="${BASH_IT}/lib/appearance.bash"
for config_file in $LIB for config_file in $LIB
do do
if [ $config_file != $APPEARANCE_LIB ]; then if [ $config_file != $APPEARANCE_LIB ]; then
# shellcheck disable=SC1090
source $config_file source $config_file
fi fi
done done
@ -53,10 +55,13 @@ do
done done
# Load colors first so they can be used in base theme # Load colors first so they can be used in base theme
# shellcheck source=./themes/colors.theme.bash
source "${BASH_IT}/themes/colors.theme.bash" source "${BASH_IT}/themes/colors.theme.bash"
# shellcheck source=./themes/base.theme.bash
source "${BASH_IT}/themes/base.theme.bash" source "${BASH_IT}/themes/base.theme.bash"
# appearance (themes) now, after all dependencies # appearance (themes) now, after all dependencies
# shellcheck source=./lib/appearance.bash
source $APPEARANCE_LIB source $APPEARANCE_LIB
# Load custom aliases, completion, plugins # Load custom aliases, completion, plugins
@ -64,6 +69,7 @@ for file_type in "aliases" "completion" "plugins"
do do
if [ -e "${BASH_IT}/${file_type}/custom.${file_type}.bash" ] if [ -e "${BASH_IT}/${file_type}/custom.${file_type}.bash" ]
then then
# shellcheck disable=SC1090
source "${BASH_IT}/${file_type}/custom.${file_type}.bash" source "${BASH_IT}/${file_type}/custom.${file_type}.bash"
fi fi
done done
@ -73,23 +79,26 @@ CUSTOM="${BASH_IT_CUSTOM:=${BASH_IT}/custom}/*.bash ${BASH_IT_CUSTOM:=${BASH_IT}
for config_file in $CUSTOM for config_file in $CUSTOM
do do
if [ -e "${config_file}" ]; then if [ -e "${config_file}" ]; then
# shellcheck disable=SC1090
source $config_file source $config_file
fi fi
done done
unset config_file unset config_file
if [[ $PROMPT ]]; then if [[ $PROMPT ]]; then
export PS1="\["$PROMPT"\]" export PS1="\[""$PROMPT""\]"
fi fi
# Adding Support for other OSes # Adding Support for other OSes
PREVIEW="less" PREVIEW="less"
[ -s /usr/bin/gloobus-preview ] && PREVIEW="gloobus-preview" [ -s /usr/bin/gloobus-preview ] && PREVIEW="gloobus-preview"
# shellcheck disable=SC2034
[ -s /Applications/Preview.app ] && PREVIEW="/Applications/Preview.app" [ -s /Applications/Preview.app ] && PREVIEW="/Applications/Preview.app"
# Load all the Jekyll stuff # Load all the Jekyll stuff
if [ -e "$HOME/.jekyllconfig" ] if [ -e "$HOME/.jekyllconfig" ]
then then
# shellcheck disable=SC1090
. "$HOME/.jekyllconfig" . "$HOME/.jekyllconfig"
fi fi