diff options
| author | Will Boyce <me@willboyce.com> | 2014-04-29 14:38:48 +0100 |
|---|---|---|
| committer | Will Boyce <me@willboyce.com> | 2014-12-08 14:30:28 +0000 |
| commit | ed029f18010ea10c7bc4a2a90f75111503e613d9 (patch) | |
| tree | d756c9db066e4632357ba05f958b7c06307ee8a1 /oh-my-zsh.sh | |
| parent | 43aa3783f8a5606e0f884a43d51daf36553af1e4 (diff) | |
| download | zsh-ed029f18010ea10c7bc4a2a90f75111503e613d9.tar.gz zsh-ed029f18010ea10c7bc4a2a90f75111503e613d9.tar.bz2 zsh-ed029f18010ea10c7bc4a2a90f75111503e613d9.zip | |
allow overriding lib/*.zsh in custom/lib
Diffstat (limited to 'oh-my-zsh.sh')
| -rw-r--r-- | oh-my-zsh.sh | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh index d0e89f31b..d75b521c7 100644 --- a/oh-my-zsh.sh +++ b/oh-my-zsh.sh @@ -8,18 +8,20 @@ fi # add a function path fpath=($ZSH/functions $ZSH/completions $fpath) -# Load all of the config files in ~/oh-my-zsh that end in .zsh -# TIP: Add files you don't want in git to .gitignore -for config_file ($ZSH/lib/*.zsh); do - source $config_file -done - # Set ZSH_CUSTOM to the path where your custom config files # and plugins exists, or else we will use the default custom/ if [[ -z "$ZSH_CUSTOM" ]]; then ZSH_CUSTOM="$ZSH/custom" fi +# Load all of the config files in ~/oh-my-zsh that end in .zsh +# TIP: Add files you don't want in git to .gitignore +for config_file ($ZSH/lib/*.zsh); do + custom_config_file="${ZSH_CUSTOM}/lib/${config_file:t}" + [ -f "${custom_config_file}" ] && config_file=${custom_config_file} + source $config_file +done + is_plugin() { local base_dir=$1 |