diff options
author | Chris McCuller <cmcculler@salesforce.com> | 2015-09-21 22:19:15 -0400 |
---|---|---|
committer | Chris McCuller <cmcculler@salesforce.com> | 2015-09-21 22:19:15 -0400 |
commit | e6ccd37b0563b4e7b34c41034766b9789e43ee5c (patch) | |
tree | c12c8c2c6437fd7d5d3ec5bff27634a80759b808 /plugins/rvm | |
parent | 30ef85664822595e29acdbc840c45d5772d84b5d (diff) | |
parent | 76a26a2a59d8c6d0f65a4426cdb93920e255aea7 (diff) | |
download | zsh-e6ccd37b0563b4e7b34c41034766b9789e43ee5c.tar.gz zsh-e6ccd37b0563b4e7b34c41034766b9789e43ee5c.tar.bz2 zsh-e6ccd37b0563b4e7b34c41034766b9789e43ee5c.zip |
Merge master (rebase being super annoying). Fix conflicts
Diffstat (limited to 'plugins/rvm')
-rw-r--r-- | plugins/rvm/rvm.plugin.zsh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/plugins/rvm/rvm.plugin.zsh b/plugins/rvm/rvm.plugin.zsh index 234ac1642..53e809aaf 100644 --- a/plugins/rvm/rvm.plugin.zsh +++ b/plugins/rvm/rvm.plugin.zsh @@ -61,11 +61,11 @@ function gems { local current_ruby=`rvm-prompt i v p` local current_gemset=`rvm-prompt g` - gem list $@ | sed \ - -Ee "s/\([0-9, \.]+( .+)?\)/$fg[blue]&$reset_color/g" \ - -Ee "s|$(echo $rvm_path)|$fg[magenta]\$rvm_path$reset_color|g" \ - -Ee "s/$current_ruby@global/$fg[yellow]&$reset_color/g" \ - -Ee "s/$current_ruby$current_gemset$/$fg[green]&$reset_color/g" + gem list $@ | sed -E \ + -e "s/\([0-9, \.]+( .+)?\)/$fg[blue]&$reset_color/g" \ + -e "s|$(echo $rvm_path)|$fg[magenta]\$rvm_path$reset_color|g" \ + -e "s/$current_ruby@global/$fg[yellow]&$reset_color/g" \ + -e "s/$current_ruby$current_gemset$/$fg[green]&$reset_color/g" } function _rvm_completion { |