diff options
| author | zghember <zghpku@gmail.com> | 2014-12-15 00:23:34 +0800 |
|---|---|---|
| committer | zghember <zghpku@gmail.com> | 2014-12-15 00:23:34 +0800 |
| commit | 6fd0b73e9aba568640005798f737cd73ad0bfdf4 (patch) | |
| tree | 22f3654e0c00ffd1cb9c3c05ca5d8bffa190cc1f /oh-my-zsh.sh | |
| parent | 6f70d288cc4625142413227109bf1eeac7e2a180 (diff) | |
| parent | 141c2e593401f245a9f9bb0799ada8bf14b677d7 (diff) | |
| download | zsh-6fd0b73e9aba568640005798f737cd73ad0bfdf4.tar.gz zsh-6fd0b73e9aba568640005798f737cd73ad0bfdf4.tar.bz2 zsh-6fd0b73e9aba568640005798f737cd73ad0bfdf4.zip | |
Merge commit '141c2e593401f245a9f9bb0799ada8bf14b677d7'
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 |