643a4e77f639c1742d1ce01d8028649ae12f8e62

Author
Robby Russell <robby@planetargon.com>
Committer
Robby Russell <robby@planetargon.com>
Date

Message

Merge pull request #375 from betawaffle/rollback-366

Rollback of Pull #366

Diff

 1diff --git a/plugins/brew/brew.plugin.zsh b/plugins/brew/brew.plugin.zsh
 2index f584a4684fe347c9be9070e1862afd3809138670..c2e95884e96fd6bb5faba415ebdbe6e9b11153f0 100644
 3--- a/plugins/brew/brew.plugin.zsh
 4+++ b/plugins/brew/brew.plugin.zsh
 5@@ -1,13 +1 @@
 6-# Move /usr/local/bin (path where brews are linked) to the front of the path
 7-# This will allow us to override system binaries like ruby with our brews
 8-# TODO: Do this in a more compatible way.
 9-#       What if someone doesn't have /usr/bin in their path?
10-export PATH=`echo $PATH | sed -e 's|/usr/local/bin||' -e 's|::|:|g'` # Remove /usr/local/bin
11-export PATH=`echo $PATH | sed -e 's|/usr/bin|/usr/local/bin:&|'`     # Add it in front of /usr/bin
12-export PATH=`echo $PATH | sed -e 's|/usr/bin|/usr/local/sbin:&|'`    # Add /usr/local/sbin
13-
14 alias brews='brew list -1'
15-
16-function brew-link-completion {
17-	ln -s "$(brew --prefix)/Library/Contributions/brew_zsh_completion.zsh" "$ZSH/plugins/brew/_brew.official"
18-}
19diff --git a/plugins/node/node.plugin.zsh b/plugins/node/node.plugin.zsh
20index 18f35333ccd510dfbb8d62058a5b28b2fc3c01f2..519bc18da425f86f2a5fd433cad5075d79a1075a 100644
21--- a/plugins/node/node.plugin.zsh
22+++ b/plugins/node/node.plugin.zsh
23@@ -1,8 +1,5 @@
24-# This works if you installed node via homebrew.
25-export NODE_PATH="/usr/local/lib/node"
26-
27 # Open the node api for your current version to the optional section.
28 # TODO: Make the section part easier to use.
29-function node-api {
30+function node-docs {
31 	open "http://nodejs.org/docs/$(node --version)/api/all.html#$1"
32 }
33diff --git a/plugins/npm/npm.plugin.zsh b/plugins/npm/npm.plugin.zsh
34deleted file mode 100644
35index 0b0a30e114072931782379c14eca74f527c96ea6..0000000000000000000000000000000000000000
36--- a/plugins/npm/npm.plugin.zsh
37+++ /dev/null
38@@ -1,2 +0,0 @@
39-# TODO: Don't do this in such a weird way.
40-export PATH=`echo $PATH | sed -e 's|/usr/bin|/usr/local/share/npm/bin:&|'`
41diff --git a/plugins/rvm/rvm.plugin.zsh b/plugins/rvm/rvm.plugin.zsh
42index 8a3ec788a4ad1363e833808cf7c410c9c3afc9e9..24621fe0b57e02b76d3179241ee2c78fc53934eb 100644
43--- a/plugins/rvm/rvm.plugin.zsh
44+++ b/plugins/rvm/rvm.plugin.zsh
45@@ -1,7 +1,3 @@
46-fpath=($ZSH/plugins/rvm $fpath)
47-autoload -U compinit
48-compinit -i
49-
50 alias rubies='rvm list rubies'
51 alias gemsets='rvm gemset list'
52 
53@@ -35,10 +31,6 @@ function rvm-update {
54 	rvm reload # TODO: Reload rvm completion?
55 }
56 
57-function rvm-link-completion {
58-	ln -s "$rvm_path/scripts/zsh/Completion/_rvm" "$ZSH/plugins/rvm/_rvm.official"
59-}
60-
61 # TODO: Make this usable w/o rvm.
62 function gems {
63 	local current_ruby=`rvm-prompt i v p`