Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Optimize plugin loading so that only one call to compinit is required

  • Loading branch information...
commit 6bf906a2622ddea1e9aae5d23c544d37fc4b6a76 1 parent 16ac094
@oknowton oknowton authored
View
13 oh-my-zsh.sh
@@ -10,14 +10,23 @@ for config_file ($ZSH/lib/*.zsh) source $config_file
# Load all of your custom configurations from custom/
for config_file ($ZSH/custom/*.zsh) source $config_file
-# Load all of the plugins that were defined in ~/.zshrc
+# Add all defined plugins to fpath
plugin=${plugin:=()}
-for plugin ($plugins) source $ZSH/plugins/$plugin/$plugin.plugin.zsh
+for plugin ($plugins) fpath=($ZSH/plugins/$plugin $fpath)
# Load and run compinit
autoload -U compinit
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
+ source $ZSH/plugins/$plugin/$plugin.plugin.zsh
+ fi
+done
+
# Load the theme
source "$ZSH/themes/$ZSH_THEME.zsh-theme"
View
2  plugins/brew/brew.plugin.zsh
@@ -1,2 +0,0 @@
-# add brew completion function to path
-fpath=($ZSH/plugins/brew $fpath)
View
2  plugins/cpanm/cpanm.plugin.zsh
@@ -1,2 +0,0 @@
-# add cpanm completion function to path
-fpath=($ZSH/plugins/cpanm $fpath)
View
2  plugins/gem/gem.plugin.zsh
@@ -1,2 +0,0 @@
-# add gem completion function to path
-fpath=($ZSH/plugins/gem $fpath)
View
2  plugins/github/github.plugin.zsh
@@ -1,2 +0,0 @@
-# add github completion function to path
-fpath=($ZSH/plugins/github $fpath)
View
2  plugins/macports/macports.plugin.zsh
@@ -6,5 +6,3 @@ alias puni="sudo port uninstall inactive"
alias puo="sudo port upgrade outdated"
alias pup="psu && puo"
-# add macports completion function to path
-fpath=($ZSH/plugins/macports $fpath)
View
2  plugins/pip/pip.plugin.zsh
@@ -1,2 +0,0 @@
-# add brew completion function to path
-fpath=($ZSH/plugins/pip $fpath)
View
1  plugins/vagrant/vagrant.plugin.zsh
@@ -1 +0,0 @@
-fpath=($ZSH/plugins/vagrant $fpath)
Please sign in to comment.
Something went wrong with that request. Please try again.