From 1e3b441ce7e0b8706867801c1e5e7ca6760ff17e Mon Sep 17 00:00:00 2001
From: Andrew Hodges <betawaffle@gmail.com>
Date: Mon, 30 May 2011 10:07:15 -0400
Subject: [PATCH 1/2] Rollback of Pull #366

sorin-ionescu had some good points.
---
 plugins/brew/brew.plugin.zsh | 12 ------------
 plugins/node/node.plugin.zsh |  5 +----
 plugins/npm/npm.plugin.zsh   |  2 --
 plugins/rvm/rvm.plugin.zsh   |  9 ++-------
 4 files changed, 3 insertions(+), 25 deletions(-)
 delete mode 100644 plugins/npm/npm.plugin.zsh

diff --git a/plugins/brew/brew.plugin.zsh b/plugins/brew/brew.plugin.zsh
index f584a4684..c2e95884e 100644
--- a/plugins/brew/brew.plugin.zsh
+++ b/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"
-}
diff --git a/plugins/node/node.plugin.zsh b/plugins/node/node.plugin.zsh
index 18f35333c..519bc18da 100644
--- a/plugins/node/node.plugin.zsh
+++ b/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"
 }
diff --git a/plugins/npm/npm.plugin.zsh b/plugins/npm/npm.plugin.zsh
deleted file mode 100644
index 0b0a30e11..000000000
--- a/plugins/npm/npm.plugin.zsh
+++ /dev/null
@@ -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:&|'`
diff --git a/plugins/rvm/rvm.plugin.zsh b/plugins/rvm/rvm.plugin.zsh
index 8a3ec788a..40fd88c1a 100644
--- a/plugins/rvm/rvm.plugin.zsh
+++ b/plugins/rvm/rvm.plugin.zsh
@@ -1,6 +1,5 @@
-fpath=($ZSH/plugins/rvm $fpath)
-autoload -U compinit
-compinit -i
+# What does this really do?
+# fpath=($ZSH/plugins/rvm $fpath)
 
 alias rubies='rvm list rubies'
 alias gemsets='rvm gemset list'
@@ -35,10 +34,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`

From 9801ad6453caa05925847f63401e6266378eb2de Mon Sep 17 00:00:00 2001
From: Andrew Hodges <betawaffle@gmail.com>
Date: Mon, 30 May 2011 11:10:08 -0400
Subject: [PATCH 2/2] Remove Uneeded Lines

---
 plugins/rvm/rvm.plugin.zsh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/plugins/rvm/rvm.plugin.zsh b/plugins/rvm/rvm.plugin.zsh
index 40fd88c1a..24621fe0b 100644
--- a/plugins/rvm/rvm.plugin.zsh
+++ b/plugins/rvm/rvm.plugin.zsh
@@ -1,6 +1,3 @@
-# What does this really do?
-# fpath=($ZSH/plugins/rvm $fpath)
-
 alias rubies='rvm list rubies'
 alias gemsets='rvm gemset list'