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

Change order of theme loading 

The base theme is now loaded after plugins, since it now uses the
`command_exists` function, which is defined in the `base` plugin.
pull/974/head
Nils Winkler 2017-05-29 17:45:51 +02:00
parent c33861a9b0
commit 228b86f3d1
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DEVELOPMENT.md
View File

@ -9,12 +9,12 @@ This page summarizes a couple of rules to keep in mind when developing features
The main `bash_it.sh` script loads the frameworks individual components in the following order: The main `bash_it.sh` script loads the frameworks individual components in the following order:
* `lib/composure.bash` * `lib/composure.bash`
* `themes/colors.theme.bash`
* `themes/base.theme.bash`
* Files in `lib` with the exception of `appearance.bash` - this means that `composure.bash` is loaded again here (possible improvement?) * Files in `lib` with the exception of `appearance.bash` - this means that `composure.bash` is loaded again here (possible improvement?)
* Enabled `aliases` * Enabled `aliases`
* Enabled `plugins` * Enabled `plugins`
* Enabled `completions` * Enabled `completions`
* `themes/colors.theme.bash`
* `themes/base.theme.bash`
* `lib/appearance.bash`, which loads the selected theme * `lib/appearance.bash`, which loads the selected theme
* Custom `aliases` * Custom `aliases`
* Custom `plugins` * Custom `plugins`

8
bash_it.sh
View File

@ -34,10 +34,6 @@ source "${BASH_IT}/lib/composure.bash"
# support 'plumbing' metadata # support 'plumbing' metadata
cite _about _param _example _group _author _version cite _about _param _example _group _author _version
# Load colors first so they can be use in base theme
source "${BASH_IT}/themes/colors.theme.bash"
source "${BASH_IT}/themes/base.theme.bash"
# libraries, but skip appearance (themes) for now # libraries, but skip appearance (themes) for now
LIB="${BASH_IT}/lib/*.bash" LIB="${BASH_IT}/lib/*.bash"
APPEARANCE_LIB="${BASH_IT}/lib/appearance.bash" APPEARANCE_LIB="${BASH_IT}/lib/appearance.bash"
@ -54,6 +50,10 @@ do
_load_bash_it_files $file_type _load_bash_it_files $file_type
done done
# Load colors first so they can be used in base theme
source "${BASH_IT}/themes/colors.theme.bash"
source "${BASH_IT}/themes/base.theme.bash"
# appearance (themes) now, after all dependencies # appearance (themes) now, after all dependencies
source $APPEARANCE_LIB source $APPEARANCE_LIB