Browse Source

Rollback of Pull #366

sorin-ionescu had some good points.
Andrew Hodges 14 years ago
parent
commit
80ed1cbc5d
  1. 12
      plugins/brew/brew.plugin.zsh
  2. 5
      plugins/node/node.plugin.zsh
  3. 2
      plugins/npm/npm.plugin.zsh
  4. 9
      plugins/rvm/rvm.plugin.zsh

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"
}

5
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"
} }

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

9
plugins/rvm/rvm.plugin.zsh

@ -1,6 +1,5 @@
fpath=($ZSH/plugins/rvm $fpath) # What does this really do?
autoload -U compinit # fpath=($ZSH/plugins/rvm $fpath)
compinit -i
alias rubies='rvm list rubies' alias rubies='rvm list rubies'
alias gemsets='rvm gemset list' alias gemsets='rvm gemset list'
@ -35,10 +34,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`

Loading…
Cancel
Save