59cb231692a171887e064fc4002da387718aaea9
- Author
- Marc Cornellà <hello@mcornella.com>
- Committer
- Marc Cornellà <hello@mcornella.com>
- Date
Message
Diff
This diff is truncated to protect this page.
1diff --git a/plugins/rbenv/rbenv.plugin.zsh b/plugins/rbenv/rbenv.plugin.zsh
2index 0f2d366e287accc644b3c8346c740c68f72010bd..d36d4922c463507bfcdf6b25c1e6a811e7481463 100644
3--- a/plugins/rbenv/rbenv.plugin.zsh
4+++ b/plugins/rbenv/rbenv.plugin.zsh
5@@ -4,65 +4,65 @@
6 FOUND_RBENV=$+commands[rbenv]
7
8 if [[ $FOUND_RBENV -ne 1 ]]; then
9- rbenvdirs=("$HOME/.rbenv" "/usr/local/rbenv" "/opt/rbenv" "/usr/local/opt/rbenv")
10- for dir in $rbenvdirs; do
11- if [[ -d $dir/bin ]]; then
12- export PATH="$dir/bin:$PATH"
13- FOUND_RBENV=1
14- break
15- fi
16- done
17+ rbenvdirs=("$HOME/.rbenv" "/usr/local/rbenv" "/opt/rbenv" "/usr/local/opt/rbenv")
18+ for dir in $rbenvdirs; do
19+ if [[ -d $dir/bin ]]; then
20+ export PATH="$dir/bin:$PATH"
21+ FOUND_RBENV=1
22+ break
23+ fi
24+ done
25 fi
26
27 if [[ $FOUND_RBENV -ne 1 ]]; then
28- if (( $+commands[brew] )) && dir=$(brew --prefix rbenv 2>/dev/null); then
29- if [[ -d $dir/bin ]]; then
30- export PATH="$dir/bin:$PATH"
31- FOUND_RBENV=1
32- fi
33+ if (( $+commands[brew] )) && dir=$(brew --prefix rbenv 2>/dev/null); then
34+ if [[ -d $dir/bin ]]; then
35+ export PATH="$dir/bin:$PATH"
36+ FOUND_RBENV=1
37 fi
38+ fi
39 fi
40
41 if [[ $FOUND_RBENV -eq 1 ]]; then
42- eval "$(rbenv init --no-rehash - zsh)"
43+ eval "$(rbenv init --no-rehash - zsh)"
44
45- alias rubies="rbenv versions"
46- alias gemsets="rbenv gemset list"
47+ alias rubies="rbenv versions"
48+ alias gemsets="rbenv gemset list"
49
50- function current_ruby() {
51- echo "$(rbenv version-name)"
52- }
53+ function current_ruby() {
54+ echo "$(rbenv version-name)"
55+ }
56
57- function current_gemset() {
58- echo "$(rbenv gemset active 2>/dev/null)" | tr ' ' '+'
59- }
60+ function current_gemset() {
61+ echo "$(rbenv gemset active 2>/dev/null)" | tr ' ' '+'
62+ }
63
64- function gems() {
65- local rbenv_path=$(rbenv prefix)
66- gem list $@ | sed -E \
67- -e "s/\([0-9a-z, \.]+( .+)?\)/$fg[blue]&$reset_color/g" \
68- -e "s|$(echo $rbenv_path)|$fg[magenta]\$rbenv_path$reset_color|g" \
69- -e "s/$current_ruby@global/$fg[yellow]&$reset_color/g" \
70- -e "s/$current_ruby$current_gemset$/$fg[green]&$reset_color/g"
71- }
72+ function gems() {
73+ local rbenv_path=$(rbenv prefix)
74+ gem list $@ | sed -E \
75+ -e "s/\([0-9a-z, \.]+( .+)?\)/$fg[blue]&$reset_color/g" \
76+ -e "s|$(echo $rbenv_path)|$fg[magenta]\$rbenv_path$reset_color|g" \
77+ -e "s/$current_ruby@global/$fg[yellow]&$reset_color/g" \
78+ -e "s/$current_ruby$current_gemset$/$fg[green]&$reset_color/g"
79+ }
80
81- function rbenv_prompt_info() {
82- local ruby=$(current_ruby) gemset=$(current_gemset)
83- echo -n "${ZSH_THEME_RUBY_PROMPT_PREFIX}"
84- [[ -n "$gemset" ]] && echo -n "${ruby}@${gemset}" || echo -n "${ruby}"
85- echo "${ZSH_THEME_RUBY_PROMPT_SUFFIX}"
86- }
87+ function rbenv_prompt_info() {
88+ local ruby=$(current_ruby) gemset=$(current_gemset)
89+ echo -n "${ZSH_THEME_RUBY_PROMPT_PREFIX}"
90+ [[ -n "$gemset" ]] && echo -n "${ruby}@${gemset}" || echo -n "${ruby}"
91+ echo "${ZSH_THEME_RUBY_PROMPT_SUFFIX}"
92+ }
93 else
94- alias rubies="ruby -v"
95- function gemsets() { echo "not supported" }
96- function current_ruby() { echo "not supported" }
97- function current_gemset() { echo "not supported" }
98- function gems() { echo "not supported" }
99- function rbenv_prompt_info() {
100- echo -n "${ZSH_THEME_RUBY_PROMPT_PREFIX}"
101- echo -n "system: $(ruby -v | cut -f-2 -d ' ')"
102- echo "${ZSH_THEME_RUBY_PROMPT_SUFFIX}"
103- }
104+ alias rubies="ruby -v"