diff options
| author | Pete Clark <pete.clark@gmail.com> | 2011-05-29 18:51:32 -0400 |
|---|---|---|
| committer | Pete Clark <pete.clark@gmail.com> | 2011-05-29 18:51:32 -0400 |
| commit | 8411a39a869cd80474e3898f2fa4f204599b943a (patch) | |
| tree | a77b33ce1d48249a405c8c9e66936351d00d637f /oh-my-zsh.sh | |
| parent | 1e86678f9d3c8c979ff8d3c8b5aac19e9e611441 (diff) | |
| parent | 142c03dbd223683fd2d99f878b68f0f075cf33fb (diff) | |
| download | zsh-8411a39a869cd80474e3898f2fa4f204599b943a.tar.gz zsh-8411a39a869cd80474e3898f2fa4f204599b943a.tar.bz2 zsh-8411a39a869cd80474e3898f2fa4f204599b943a.zip | |
Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh into taskwarrior-plugin
Diffstat (limited to 'oh-my-zsh.sh')
| -rw-r--r-- | oh-my-zsh.sh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh index 3ea88e924..dbff1ced9 100644 --- a/oh-my-zsh.sh +++ b/oh-my-zsh.sh @@ -1,7 +1,7 @@ # Initializes Oh My Zsh # add a function path -fpath=($ZSH/functions $fpath) +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 @@ -17,7 +17,9 @@ compinit -i # Load all of the plugins that were defined in ~/.zshrc for plugin ($plugins); do - if [ -f $ZSH/plugins/$plugin/$plugin.plugin.zsh ]; then + if [ -f $ZSH/custom/plugins/$plugin/$plugin.plugin.zsh ]; then + source $ZSH/custom/plugins/$plugin/$plugin.plugin.zsh + elif [ -f $ZSH/plugins/$plugin/$plugin.plugin.zsh ]; then source $ZSH/plugins/$plugin/$plugin.plugin.zsh fi done @@ -31,7 +33,7 @@ if [ "$ZSH_THEME" = "random" ] then themes=($ZSH/themes/*zsh-theme) N=${#themes[@]} - ((N=RANDOM%N)) + ((N=(RANDOM%N)+1)) RANDOM_THEME=${themes[$N]} source "$RANDOM_THEME" echo "[oh-my-zsh] Random theme '$RANDOM_THEME' loaded..." |