linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2025-12-26 02:12:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:jamesm-sitegen/oh-my-zsh

Browse source 
Conflicts:
	omz
This commit is contained in:
Simon Gomizelj 2011-12-05 09:29:33 -05:00
commit f31cd6a94e
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
omz
View file

@ -48,8 +48,8 @@ omz() {
# for plugin ($fpath/*.plugin.zsh(N)) source $plugin
for plugin ($plugins); do
plugin_sub=$(basename $plugin)
if [[ -f $OMZ/plugins/$plugin/$plugin_sub.plugin.zsh ]]; then
source $OMZ/plugins/$plugin/$plugin_sub.plugin.zsh
if [[ -f $OMZ/plugins/$plugin/$plugin_sub.plugin.zsh ]]; then
source $OMZ/plugins/$plugin/$plugin_sub.plugin.zsh
elif [[ -f $ZSH/plugins/$plugin/$plugin_sub.plugin.zsh ]]; then
source $ZSH/plugins/$plugin/$plugin_sub.plugin.zsh
fi