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

fixed a tiny issue

Browse source
This commit is contained in:
James McGlashan 2011-11-30 20:24:18 +11:00
commit 9de9bd7d61
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
oh-my-zsh.zsh
View file

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