From 71d5e5625eb857ceb313ec97067bf77bfdbfa2cc Mon Sep 17 00:00:00 2001
From: Sorin Ionescu <sorin.ionescu@gmail.com>
Date: Tue, 13 Sep 2011 23:02:01 -0400
Subject: [PATCH] Renamed plugin files to init.zsh.

Since plugins are under their own directories, the /plugins/foo/foo.plugin.zsh
naming scheme is redundant.

Naming the entry point of plugins init.zsh will encourage the splitting of
large plugins into multiple files.
---
 oh-my-zsh.zsh => init.zsh                                   | 6 +++---
 plugins/ant/{ant.plugin.zsh => init.zsh}                    | 0
 .../{apache2-macports.plugin.zsh => init.zsh}               | 0
 plugins/archive/{archive.plugin.zsh => init.zsh}            | 0
 plugins/autojump/{autojump.plugin.zsh => init.zsh}          | 0
 plugins/brew/{brew.plugin.zsh => init.zsh}                  | 0
 plugins/bundler/{bundler.plugin.zsh => init.zsh}            | 0
 plugins/cake/{cake.plugin.zsh => init.zsh}                  | 0
 plugins/capistrano/{capistrano.plugin.zsh => init.zsh}      | 0
 plugins/cloudapp/cloudapp.plugin.zsh                        | 2 --
 plugins/cloudapp/init.zsh                                   | 2 ++
 .../{command-not-found.plugin.zsh => init.zsh}              | 0
 plugins/compleat/{compleat.plugin.zsh => init.zsh}          | 0
 plugins/dirpersist/{dirpersist.plugin.zsh => init.zsh}      | 0
 plugins/dpkg/{dpkg.plugin.zsh => init.zsh}                  | 0
 plugins/git-flow/{git-flow.plugin.zsh => init.zsh}          | 0
 plugins/git/{git.plugin.zsh => init.zsh}                    | 0
 plugins/github/{github.plugin.zsh => init.zsh}              | 0
 plugins/gnu-utils/{gnu-utils.plugin.zsh => init.zsh}        | 0
 plugins/gpg-agent/{gpg-agent.plugin.zsh => init.zsh}        | 0
 .../{history-substring-search.plugin.zsh => init.zsh}       | 2 +-
 plugins/kate/{kate.plugin.zsh => init.zsh}                  | 0
 plugins/leiningen/{leiningen.plugin.zsh => init.zsh}        | 0
 plugins/lighthouse/{lighthouse.plugin.zsh => init.zsh}      | 0
 plugins/lol/{lol.plugin.zsh => init.zsh}                    | 0
 plugins/macports/{macports.plugin.zsh => init.zsh}          | 0
 .../mysql-macports/{mysql-macports.plugin.zsh => init.zsh}  | 0
 plugins/node/{node.plugin.zsh => init.zsh}                  | 0
 plugins/osx/{osx.plugin.zsh => init.zsh}                    | 0
 plugins/pacman/{pacman.plugin.zsh => init.zsh}              | 0
 plugins/perl/{perl.plugin.zsh => init.zsh}                  | 0
 plugins/phing/{phing.plugin.zsh => init.zsh}                | 0
 plugins/pow/{pow.plugin.zsh => init.zsh}                    | 0
 plugins/python/{python.plugin.zsh => init.zsh}              | 0
 plugins/rails/{rails.plugin.zsh => init.zsh}                | 0
 plugins/rails3/{rails3.plugin.zsh => init.zsh}              | 0
 plugins/ruby/{ruby.plugin.zsh => init.zsh}                  | 0
 plugins/screen/{screen.plugin.zsh => init.zsh}              | 0
 plugins/ssh-agent/{ssh-agent.plugin.zsh => init.zsh}        | 0
 plugins/taskwarrior/{taskwarrior.plugin.zsh => init.zsh}    | 0
 plugins/textmate/{textmate.plugin.zsh => init.zsh}          | 0
 plugins/tmux/{tmux.plugin.zsh => init.zsh}                  | 0
 plugins/yum/{yum.plugin.zsh => init.zsh}                    | 0
 plugins/z/{z.plugin.zsh => init.zsh}                        | 0
 templates/{zshrc.template.zsh => zshrc.zsh}                 | 2 +-
 45 files changed, 7 insertions(+), 7 deletions(-)
 rename oh-my-zsh.zsh => init.zsh (83%)
 rename plugins/ant/{ant.plugin.zsh => init.zsh} (100%)
 rename plugins/apache2-macports/{apache2-macports.plugin.zsh => init.zsh} (100%)
 rename plugins/archive/{archive.plugin.zsh => init.zsh} (100%)
 rename plugins/autojump/{autojump.plugin.zsh => init.zsh} (100%)
 rename plugins/brew/{brew.plugin.zsh => init.zsh} (100%)
 rename plugins/bundler/{bundler.plugin.zsh => init.zsh} (100%)
 rename plugins/cake/{cake.plugin.zsh => init.zsh} (100%)
 rename plugins/capistrano/{capistrano.plugin.zsh => init.zsh} (100%)
 delete mode 100644 plugins/cloudapp/cloudapp.plugin.zsh
 create mode 100644 plugins/cloudapp/init.zsh
 rename plugins/command-not-found/{command-not-found.plugin.zsh => init.zsh} (100%)
 rename plugins/compleat/{compleat.plugin.zsh => init.zsh} (100%)
 rename plugins/dirpersist/{dirpersist.plugin.zsh => init.zsh} (100%)
 rename plugins/dpkg/{dpkg.plugin.zsh => init.zsh} (100%)
 rename plugins/git-flow/{git-flow.plugin.zsh => init.zsh} (100%)
 rename plugins/git/{git.plugin.zsh => init.zsh} (100%)
 rename plugins/github/{github.plugin.zsh => init.zsh} (100%)
 rename plugins/gnu-utils/{gnu-utils.plugin.zsh => init.zsh} (100%)
 rename plugins/gpg-agent/{gpg-agent.plugin.zsh => init.zsh} (100%)
 rename plugins/history-substring-search/{history-substring-search.plugin.zsh => init.zsh} (87%)
 rename plugins/kate/{kate.plugin.zsh => init.zsh} (100%)
 rename plugins/leiningen/{leiningen.plugin.zsh => init.zsh} (100%)
 rename plugins/lighthouse/{lighthouse.plugin.zsh => init.zsh} (100%)
 rename plugins/lol/{lol.plugin.zsh => init.zsh} (100%)
 rename plugins/macports/{macports.plugin.zsh => init.zsh} (100%)
 rename plugins/mysql-macports/{mysql-macports.plugin.zsh => init.zsh} (100%)
 rename plugins/node/{node.plugin.zsh => init.zsh} (100%)
 rename plugins/osx/{osx.plugin.zsh => init.zsh} (100%)
 rename plugins/pacman/{pacman.plugin.zsh => init.zsh} (100%)
 rename plugins/perl/{perl.plugin.zsh => init.zsh} (100%)
 rename plugins/phing/{phing.plugin.zsh => init.zsh} (100%)
 rename plugins/pow/{pow.plugin.zsh => init.zsh} (100%)
 rename plugins/python/{python.plugin.zsh => init.zsh} (100%)
 rename plugins/rails/{rails.plugin.zsh => init.zsh} (100%)
 rename plugins/rails3/{rails3.plugin.zsh => init.zsh} (100%)
 rename plugins/ruby/{ruby.plugin.zsh => init.zsh} (100%)
 rename plugins/screen/{screen.plugin.zsh => init.zsh} (100%)
 rename plugins/ssh-agent/{ssh-agent.plugin.zsh => init.zsh} (100%)
 rename plugins/taskwarrior/{taskwarrior.plugin.zsh => init.zsh} (100%)
 rename plugins/textmate/{textmate.plugin.zsh => init.zsh} (100%)
 rename plugins/tmux/{tmux.plugin.zsh => init.zsh} (100%)
 rename plugins/yum/{yum.plugin.zsh => init.zsh} (100%)
 rename plugins/z/{z.plugin.zsh => init.zsh} (100%)
 rename templates/{zshrc.template.zsh => zshrc.zsh} (96%)

diff --git a/oh-my-zsh.zsh b/init.zsh
similarity index 83%
rename from oh-my-zsh.zsh
rename to init.zsh
index 7635683f..ab7b6d16 100644
--- a/oh-my-zsh.zsh
+++ b/init.zsh
@@ -14,10 +14,10 @@ autoload -Uz compinit && compinit -i
 # Source function files.
 source "$OMZ/functions/init.zsh"
 
-# Load all plugins defined in ~/.zshrc.
+# Source plugins defined in ~/.zshrc.
 for plugin in $plugins; do
-  if [[ -f "$OMZ/plugins/$plugin/$plugin.plugin.zsh" ]]; then
-    source "$OMZ/plugins/$plugin/$plugin.plugin.zsh"
+  if [[ -f "$OMZ/plugins/$plugin/init.zsh" ]]; then
+    source "$OMZ/plugins/$plugin/init.zsh"
   fi
 done
 
diff --git a/plugins/ant/ant.plugin.zsh b/plugins/ant/init.zsh
similarity index 100%
rename from plugins/ant/ant.plugin.zsh
rename to plugins/ant/init.zsh
diff --git a/plugins/apache2-macports/apache2-macports.plugin.zsh b/plugins/apache2-macports/init.zsh
similarity index 100%
rename from plugins/apache2-macports/apache2-macports.plugin.zsh
rename to plugins/apache2-macports/init.zsh
diff --git a/plugins/archive/archive.plugin.zsh b/plugins/archive/init.zsh
similarity index 100%
rename from plugins/archive/archive.plugin.zsh
rename to plugins/archive/init.zsh
diff --git a/plugins/autojump/autojump.plugin.zsh b/plugins/autojump/init.zsh
similarity index 100%
rename from plugins/autojump/autojump.plugin.zsh
rename to plugins/autojump/init.zsh
diff --git a/plugins/brew/brew.plugin.zsh b/plugins/brew/init.zsh
similarity index 100%
rename from plugins/brew/brew.plugin.zsh
rename to plugins/brew/init.zsh
diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/init.zsh
similarity index 100%
rename from plugins/bundler/bundler.plugin.zsh
rename to plugins/bundler/init.zsh
diff --git a/plugins/cake/cake.plugin.zsh b/plugins/cake/init.zsh
similarity index 100%
rename from plugins/cake/cake.plugin.zsh
rename to plugins/cake/init.zsh
diff --git a/plugins/capistrano/capistrano.plugin.zsh b/plugins/capistrano/init.zsh
similarity index 100%
rename from plugins/capistrano/capistrano.plugin.zsh
rename to plugins/capistrano/init.zsh
diff --git a/plugins/cloudapp/cloudapp.plugin.zsh b/plugins/cloudapp/cloudapp.plugin.zsh
deleted file mode 100644
index 859c84ec..00000000
--- a/plugins/cloudapp/cloudapp.plugin.zsh
+++ /dev/null
@@ -1,2 +0,0 @@
-alias cloudapp="${0:r:r}.rb"
-
diff --git a/plugins/cloudapp/init.zsh b/plugins/cloudapp/init.zsh
new file mode 100644
index 00000000..87c5c388
--- /dev/null
+++ b/plugins/cloudapp/init.zsh
@@ -0,0 +1,2 @@
+alias cloudapp="${0:h}/cloudapp.rb"
+
diff --git a/plugins/command-not-found/command-not-found.plugin.zsh b/plugins/command-not-found/init.zsh
similarity index 100%
rename from plugins/command-not-found/command-not-found.plugin.zsh
rename to plugins/command-not-found/init.zsh
diff --git a/plugins/compleat/compleat.plugin.zsh b/plugins/compleat/init.zsh
similarity index 100%
rename from plugins/compleat/compleat.plugin.zsh
rename to plugins/compleat/init.zsh
diff --git a/plugins/dirpersist/dirpersist.plugin.zsh b/plugins/dirpersist/init.zsh
similarity index 100%
rename from plugins/dirpersist/dirpersist.plugin.zsh
rename to plugins/dirpersist/init.zsh
diff --git a/plugins/dpkg/dpkg.plugin.zsh b/plugins/dpkg/init.zsh
similarity index 100%
rename from plugins/dpkg/dpkg.plugin.zsh
rename to plugins/dpkg/init.zsh
diff --git a/plugins/git-flow/git-flow.plugin.zsh b/plugins/git-flow/init.zsh
similarity index 100%
rename from plugins/git-flow/git-flow.plugin.zsh
rename to plugins/git-flow/init.zsh
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/init.zsh
similarity index 100%
rename from plugins/git/git.plugin.zsh
rename to plugins/git/init.zsh
diff --git a/plugins/github/github.plugin.zsh b/plugins/github/init.zsh
similarity index 100%
rename from plugins/github/github.plugin.zsh
rename to plugins/github/init.zsh
diff --git a/plugins/gnu-utils/gnu-utils.plugin.zsh b/plugins/gnu-utils/init.zsh
similarity index 100%
rename from plugins/gnu-utils/gnu-utils.plugin.zsh
rename to plugins/gnu-utils/init.zsh
diff --git a/plugins/gpg-agent/gpg-agent.plugin.zsh b/plugins/gpg-agent/init.zsh
similarity index 100%
rename from plugins/gpg-agent/gpg-agent.plugin.zsh
rename to plugins/gpg-agent/init.zsh
diff --git a/plugins/history-substring-search/history-substring-search.plugin.zsh b/plugins/history-substring-search/init.zsh
similarity index 87%
rename from plugins/history-substring-search/history-substring-search.plugin.zsh
rename to plugins/history-substring-search/init.zsh
index 12d8dc52..e31eb17f 100644
--- a/plugins/history-substring-search/history-substring-search.plugin.zsh
+++ b/plugins/history-substring-search/init.zsh
@@ -1,6 +1,6 @@
 # This file integrates the history-substring-search script into oh-my-zsh.
 
-source "${0:r:r}.zsh"
+source "${0:h}/history-substring-search.zsh"
 
 if check-bool "$CASE_SENSITIVE"; then
   unset HISTORY_SUBSTRING_SEARCH_GLOBBING_FLAGS
diff --git a/plugins/kate/kate.plugin.zsh b/plugins/kate/init.zsh
similarity index 100%
rename from plugins/kate/kate.plugin.zsh
rename to plugins/kate/init.zsh
diff --git a/plugins/leiningen/leiningen.plugin.zsh b/plugins/leiningen/init.zsh
similarity index 100%
rename from plugins/leiningen/leiningen.plugin.zsh
rename to plugins/leiningen/init.zsh
diff --git a/plugins/lighthouse/lighthouse.plugin.zsh b/plugins/lighthouse/init.zsh
similarity index 100%
rename from plugins/lighthouse/lighthouse.plugin.zsh
rename to plugins/lighthouse/init.zsh
diff --git a/plugins/lol/lol.plugin.zsh b/plugins/lol/init.zsh
similarity index 100%
rename from plugins/lol/lol.plugin.zsh
rename to plugins/lol/init.zsh
diff --git a/plugins/macports/macports.plugin.zsh b/plugins/macports/init.zsh
similarity index 100%
rename from plugins/macports/macports.plugin.zsh
rename to plugins/macports/init.zsh
diff --git a/plugins/mysql-macports/mysql-macports.plugin.zsh b/plugins/mysql-macports/init.zsh
similarity index 100%
rename from plugins/mysql-macports/mysql-macports.plugin.zsh
rename to plugins/mysql-macports/init.zsh
diff --git a/plugins/node/node.plugin.zsh b/plugins/node/init.zsh
similarity index 100%
rename from plugins/node/node.plugin.zsh
rename to plugins/node/init.zsh
diff --git a/plugins/osx/osx.plugin.zsh b/plugins/osx/init.zsh
similarity index 100%
rename from plugins/osx/osx.plugin.zsh
rename to plugins/osx/init.zsh
diff --git a/plugins/pacman/pacman.plugin.zsh b/plugins/pacman/init.zsh
similarity index 100%
rename from plugins/pacman/pacman.plugin.zsh
rename to plugins/pacman/init.zsh
diff --git a/plugins/perl/perl.plugin.zsh b/plugins/perl/init.zsh
similarity index 100%
rename from plugins/perl/perl.plugin.zsh
rename to plugins/perl/init.zsh
diff --git a/plugins/phing/phing.plugin.zsh b/plugins/phing/init.zsh
similarity index 100%
rename from plugins/phing/phing.plugin.zsh
rename to plugins/phing/init.zsh
diff --git a/plugins/pow/pow.plugin.zsh b/plugins/pow/init.zsh
similarity index 100%
rename from plugins/pow/pow.plugin.zsh
rename to plugins/pow/init.zsh
diff --git a/plugins/python/python.plugin.zsh b/plugins/python/init.zsh
similarity index 100%
rename from plugins/python/python.plugin.zsh
rename to plugins/python/init.zsh
diff --git a/plugins/rails/rails.plugin.zsh b/plugins/rails/init.zsh
similarity index 100%
rename from plugins/rails/rails.plugin.zsh
rename to plugins/rails/init.zsh
diff --git a/plugins/rails3/rails3.plugin.zsh b/plugins/rails3/init.zsh
similarity index 100%
rename from plugins/rails3/rails3.plugin.zsh
rename to plugins/rails3/init.zsh
diff --git a/plugins/ruby/ruby.plugin.zsh b/plugins/ruby/init.zsh
similarity index 100%
rename from plugins/ruby/ruby.plugin.zsh
rename to plugins/ruby/init.zsh
diff --git a/plugins/screen/screen.plugin.zsh b/plugins/screen/init.zsh
similarity index 100%
rename from plugins/screen/screen.plugin.zsh
rename to plugins/screen/init.zsh
diff --git a/plugins/ssh-agent/ssh-agent.plugin.zsh b/plugins/ssh-agent/init.zsh
similarity index 100%
rename from plugins/ssh-agent/ssh-agent.plugin.zsh
rename to plugins/ssh-agent/init.zsh
diff --git a/plugins/taskwarrior/taskwarrior.plugin.zsh b/plugins/taskwarrior/init.zsh
similarity index 100%
rename from plugins/taskwarrior/taskwarrior.plugin.zsh
rename to plugins/taskwarrior/init.zsh
diff --git a/plugins/textmate/textmate.plugin.zsh b/plugins/textmate/init.zsh
similarity index 100%
rename from plugins/textmate/textmate.plugin.zsh
rename to plugins/textmate/init.zsh
diff --git a/plugins/tmux/tmux.plugin.zsh b/plugins/tmux/init.zsh
similarity index 100%
rename from plugins/tmux/tmux.plugin.zsh
rename to plugins/tmux/init.zsh
diff --git a/plugins/yum/yum.plugin.zsh b/plugins/yum/init.zsh
similarity index 100%
rename from plugins/yum/yum.plugin.zsh
rename to plugins/yum/init.zsh
diff --git a/plugins/z/z.plugin.zsh b/plugins/z/init.zsh
similarity index 100%
rename from plugins/z/z.plugin.zsh
rename to plugins/z/init.zsh
diff --git a/templates/zshrc.template.zsh b/templates/zshrc.zsh
similarity index 96%
rename from templates/zshrc.template.zsh
rename to templates/zshrc.zsh
index 1cc9130e..93b67fef 100644
--- a/templates/zshrc.template.zsh
+++ b/templates/zshrc.zsh
@@ -24,7 +24,7 @@ COMPLETION_INDICATOR='false'
 plugins=(git)
 
 # This will make you scream: OH MY ZSH!
-source "$OMZ/oh-my-zsh.zsh"
+source "$OMZ/init.zsh"
 
 # Load the prompt theme (type prompt -l to list all themes).
 # Setting it to 'random' loads a random theme.