diff --git a/oh-my-zsh.zsh b/oh-my-zsh.zsh index d4f3fe3a0..eb5681f32 100644 --- a/oh-my-zsh.zsh +++ b/oh-my-zsh.zsh @@ -1,6 +1,6 @@ # Initializes Oh My Zsh ZSH=${ZSH:-/usr/share/oh-my-zsh} -ZSH2=$HOME/.zsh +OMZ=$HOME/.zsh local config_file plugin plugin=${plugin:=()} @@ -8,16 +8,16 @@ plugin=${plugin:=()} # add a function path fpath=($ZSH/functions $ZSH/completions $fpath) -if [[ -d $OMZ2 ]]; then - [[ -d $OMZ2/functions ]] && fpath=($OMZ2/functions $fpath) - [[ -d $OMZ2/completion ]] && fpath=($OMZ2/completions $fpath) +if [[ -d $OMZ ]]; then + [[ -d $OMZ/functions ]] && fpath=($OMZ/functions $fpath) + [[ -d $OMZ/completion ]] && fpath=($OMZ/completions $fpath) fi for config_file ($ZSH/lib/*.zsh(N)) source $config_file if [[ -d ~/.omz ]]; then - for config_file ($OMG2/*.zsh(N)) + for config_file ($OMG/*.zsh(N)) source $config_file fi @@ -25,9 +25,9 @@ for plugin ($plugins) fpath=($ZSH/plugins/$plugin $fpath) if [[ -d ~/.omz ]]; then - if [[ -d $OMZ2/plugins ]]; then + if [[ -d $OMZ/plugins ]]; then for plugin ($plugins) - fpath=($OMZ2/plugins/$plugin $fpath) + fpath=($OMZ/plugins/$plugin $fpath) fi fi @@ -37,8 +37,8 @@ compinit -i # load plugins for plugin ($plugins); do - if [[ -f $OMZ2/plugins/$plugin/$plugin.plugin.zsh ]]; then - source $OMZ2/plugins/$plugin/$plugin.plugin.zsh + if [[ -f $OMZ/plugins/$plugin/$plugin.plugin.zsh ]]; then + source $OMZ/plugins/$plugin/$plugin.plugin.zsh elif [[ -f $ZSH/plugins/$plugin/$plugin.plugin.zsh ]]; then source $ZSH/plugins/$plugin/$plugin.plugin.zsh fi