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 'split'

Browse source 
Conflicts:
	oh-my-zsh.zsh
This commit is contained in:
Simon Gomizelj 2011-11-29 07:38:33 -05:00
commit 36d897addd
1 changed files with 20 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

27
oh-my-zsh.zsh
View file

@ -3,29 +3,42 @@ ZSH=${ZSH:-/usr/share/oh-my-zsh/}
local config_file plugin
# Load and run compinit
autoload -U compinit
compinit -i
# add a function path
fpath=($ZSH/functions $ZSH/completions $fpath)
for config_file ($ZSH/lib/*.zsh) source $config_file
plugin=${plugin:=()}
for plugin ($plugins) fpath=($ZSH/plugins/$plugin $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) source $config_file
if [[ -d ~/.omz ]]; then
if [[ -d ~/.omz/lib ]]; then
for config_file (~/.omz/lib/*.zsh) source $config_file
fi
fi
plugin=${plugin:=()}
for plugin ($plugins) fpath=($ZSH/plugins/$plugin $fpath)
if [[ -d ~/.omz ]]; then
if [[ -d ~/.omz/plugins ]]; then
for plugin ($plugins) fpath=(~/.omz/plugins/$plugin $fpath)
fi
fi
# Load and run compinit
autoload -U compinit
compinit -i
# load plugins
for plugin ($plugins); do
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
done
# Load the theme
if [ "$ZSH_THEME" = "random" ]
then