Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh

Conflicts:
	tools/upgrade.sh

plugins/ant/ant.plugin.zsh

@@ -2,14 +2,14 @@ stat -f%m . > /dev/null 2>&1
 if [ "$?" = 0 ]; then
 	stat_cmd=(stat -f%m)
 else
-	stat_cmd=(stat -L --format=%y)
+	stat_cmd=(stat -L --format=%Y)
 fi
 
 _ant_does_target_list_need_generating () {
   if [ ! -f .ant_targets ]; then return 0;
   else
-    accurate=$($stat_cmd -f%m .ant_targets)
-    changed=$($stat_cmd -f%m build.xml)
+    accurate=$($stat_cmd .ant_targets)
+    changed=$($stat_cmd build.xml)
     return $(expr $accurate '>=' $changed)
   fi
 }

plugins/brew/brew.plugin.zsh

@@ -1,13 +1 @@
-# Move /usr/local/bin (path where brews are linked) to the front of the path
-# This will allow us to override system binaries like ruby with our brews
-# TODO: Do this in a more compatible way.
-#       What if someone doesn't have /usr/bin in their path?
-export PATH=`echo $PATH | sed -e 's|/usr/local/bin||' -e 's|::|:|g'` # Remove /usr/local/bin
-export PATH=`echo $PATH | sed -e 's|/usr/bin|/usr/local/bin:&|'`     # Add it in front of /usr/bin
-export PATH=`echo $PATH | sed -e 's|/usr/bin|/usr/local/sbin:&|'`    # Add /usr/local/sbin
-
 alias brews='brew list -1'
-
-function brew-link-completion {
-	ln -s "$(brew --prefix)/Library/Contributions/brew_zsh_completion.zsh" "$ZSH/plugins/brew/_brew.official"
-}

plugins/node/node.plugin.zsh

@@ -1,8 +1,5 @@
-# This works if you installed node via homebrew.
-export NODE_PATH="/usr/local/lib/node"
-
 # Open the node api for your current version to the optional section.
 # TODO: Make the section part easier to use.
-function node-api {
+function node-docs {
 	open "http://nodejs.org/docs/$(node --version)/api/all.html#$1"
 }

plugins/npm/npm.plugin.zsh

@@ -1,2 +0,0 @@
-# TODO: Don't do this in such a weird way.
-export PATH=`echo $PATH | sed -e 's|/usr/bin|/usr/local/share/npm/bin:&|'`

plugins/rvm/rvm.plugin.zsh

@@ -1,7 +1,3 @@
-fpath=($ZSH/plugins/rvm $fpath)
-autoload -U compinit
-compinit -i
-
 alias rubies='rvm list rubies'
 alias gemsets='rvm gemset list'
 
@@ -35,10 +31,6 @@ function rvm-update {
 	rvm reload # TODO: Reload rvm completion?
 }
 
-function rvm-link-completion {
-	ln -s "$rvm_path/scripts/zsh/Completion/_rvm" "$ZSH/plugins/rvm/_rvm.official"
-}
-
 # TODO: Make this usable w/o rvm.
 function gems {
 	local current_ruby=`rvm-prompt i v p`

plugins/svn/svn.plugin.zsh

@@ -13,7 +13,7 @@ function in_svn() {
 }
 
 function svn_get_repo_name {
-    if [ is_svn ]; then
+    if [ in_svn ]; then
         svn info | sed -n 's/Repository\ Root:\ .*\///p' | read SVN_ROOT
     
         svn info | sed -n "s/URL:\ .*$SVN_ROOT\///p" | sed "s/\/.*$//"
@@ -21,13 +21,13 @@ function svn_get_repo_name {
 }
 
 function svn_get_rev_nr {
-    if [ is_svn ]; then
+    if [ in_svn ]; then
         svn info 2> /dev/null | sed -n s/Revision:\ //p
     fi
 }
 
 function svn_dirty_choose {
-    if [ is_svn ]; then
+    if [ in_svn ]; then
         s=$(svn status 2>/dev/null)
         if [ $s ]; then 
             echo $1
@@ -39,4 +39,4 @@ function svn_dirty_choose {
 
 function svn_dirty {
     svn_dirty_choose $ZSH_THEME_SVN_PROMPT_DIRTY $ZSH_THEME_SVN_PROMPT_CLEAN
-}
+}