浏览代码

Merge pull request #375 from betawaffle/rollback-366

Rollback of Pull #366
Robby Russell 14 年之前
父节点
当前提交
643a4e77f6
共有 4 个文件被更改,包括 1 次插入26 次删除
  1. 0 12
      plugins/brew/brew.plugin.zsh
  2. 1 4
      plugins/node/node.plugin.zsh
  3. 0 2
      plugins/npm/npm.plugin.zsh
  4. 0 8
      plugins/rvm/rvm.plugin.zsh

+ 0 - 12
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'
 alias brews='brew list -1'
-
-function brew-link-completion {
-	ln -s "$(brew --prefix)/Library/Contributions/brew_zsh_completion.zsh" "$ZSH/plugins/brew/_brew.official"
-}

+ 1 - 4
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.
 # Open the node api for your current version to the optional section.
 # TODO: Make the section part easier to use.
 # 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"
 	open "http://nodejs.org/docs/$(node --version)/api/all.html#$1"
 }
 }

+ 0 - 2
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:&|'`

+ 0 - 8
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 rubies='rvm list rubies'
 alias gemsets='rvm gemset list'
 alias gemsets='rvm gemset list'
 
 
@@ -35,10 +31,6 @@ function rvm-update {
 	rvm reload # TODO: Reload rvm completion?
 	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.
 # TODO: Make this usable w/o rvm.
 function gems {
 function gems {
 	local current_ruby=`rvm-prompt i v p`
 	local current_ruby=`rvm-prompt i v p`