rvm 0.0.57 → 0.0.58

Sign up to get free protection for your applications and to get access to all the features.
Files changed (13) hide show
  1. data/install +32 -32
  2. data/lib/VERSION.yml +1 -1
  3. data/rvm.gemspec +2 -2
  4. data/scripts/cli +28 -28
  5. data/scripts/completion +2 -4
  6. data/scripts/gems +5 -5
  7. data/scripts/install +32 -32
  8. data/scripts/ruby-installer +30 -31
  9. data/scripts/rvm-install +32 -32
  10. data/scripts/selector +20 -20
  11. data/scripts/update +32 -32
  12. data/scripts/utility +54 -55
  13. metadata +2 -2
data/install CHANGED
@@ -1,21 +1,21 @@
1
1
  #!/bin/bash
2
2
 
3
- user=`whoami`
4
- if [ "$user" = "root" ] ; then
5
- echo -e "\033[0;31m <e> \033[0mroot user support is not yet implemented.\033[0m"
3
+ user="$(whoami)"
4
+ if [ "root" = "$user" ] ; then
5
+ echo -e "$(tput setaf 1) <e> root user support is not yet implemented.$(tput sgr0)"
6
6
  exit 1
7
7
  fi
8
8
 
9
- item="\033[0;32m* \033[0m"
10
- question="\n\033[0;32m<?>\033[0m"
9
+ item="$(tput setaf 2)* $(tput sgr0)"
10
+ question="\n$(tput setaf 2)<?>$(tput sgr0)"
11
11
  cwd=$(pwd)
12
- source_dir="${source_dir:-`dirname $0 | xargs dirname`}"
12
+ source_dir="${source_dir:-"$(dirname $0 | xargs dirname)"}"
13
13
  if [ ! -d "$source_dir" ] ; then unset source_dir ; fi
14
14
  source_dir="${source_dir:-$cwd}"
15
15
  rvm_path=~/.rvm
16
16
 
17
17
  # State what is required to use rvm
18
- echo -e "\n\033[0;32mrvm\033[0m\n\n shell scripts that allows a user to manage multiple ruby versions in their own account."
18
+ echo -e "\n$(tput setaf 2)rvm$(tput sgr0)\n\n shell scripts that allows a user to manage multiple ruby versions in their own account."
19
19
  echo -e "\n Installing rvm to ~/.rvm/ ..."
20
20
  for dir_name in src scripts bin log archives config gems examples ; do
21
21
  mkdir -p $rvm_path/$dir_name
@@ -46,7 +46,7 @@ echo -e "\n Ensuring that rvm script location in $file is scripts/rvm not bin
46
46
  for file in ~/.bash_profile ~/.bashrc ~/.zshrc ; do
47
47
  if [ -s $file ] ; then
48
48
  if [ -L $file ] ; then # If the file is a symlink,
49
- actual_file=`readlink $file` # read the link target so we can preserve it.
49
+ actual_file="$(readlink $file)" # read the link target so we can preserve it.
50
50
  else
51
51
  actual_file="$file"
52
52
  fi
@@ -73,47 +73,47 @@ if [ -f ~/.rvm/bin/rvm ] ; then
73
73
  rm -f ~/.rvm/bin/rvm
74
74
  fi
75
75
 
76
- system=`uname`
77
- echo -e "\n \033[0;33mNOTES: \033[0m"
78
- if [ "$system" = "Linux" ] ; then
79
- rvm_apt_get_binary=`which apt-get 2> /dev/null`
80
- rvm_emerge_binary=`which emerge 2> /dev/null`
81
- rvm_pacman_binary=`which pacman 2> /dev/null`
82
- rvm_yum_binary=`which yum 2> /dev/null`
76
+ system="$(uname)"
77
+ echo -e "\n $(tput setaf 3)NOTES: $(tput sgr0)\n"
78
+ if [ "Linux" = "$system" ] ; then
79
+ rvm_apt_get_binary="$(which apt-get 2> /dev/null)"
80
+ rvm_emerge_binary="$(which emerge 2> /dev/null)"
81
+ rvm_pacman_binary="$(which pacman 2> /dev/null)"
82
+ rvm_yum_binary="$(which yum 2> /dev/null)"
83
83
 
84
84
  if [ ! -z "$rvm_apt_get_binary" ] ; then
85
- echo -e " $item For jRuby (if you wish to use it) you will need:"
86
- echo -e " $ sudo apt-get install sun-java6-bin sun-java6-jre sun-java6-jdk"
87
- echo -e " $item For ree (if you wish to use it) you will need:"
88
- echo -e " $ sudo apt-get install libreadline5-dev libssl-dev bison"
85
+ echo -e " $item For jRuby (if you wish to use it) you will need:"
86
+ echo -e " $ sudo apt-get install sun-java6-bin sun-java6-jre sun-java6-jdk"
87
+ echo -e " $item For ree (if you wish to use it) you will need:"
88
+ echo -e " $ sudo apt-get install libreadline5-dev libssl-dev bison"
89
89
 
90
90
  elif [ ! -z "$rvm_emerge_binary" ] ; then
91
- echo -e " $item For jRuby (if you wish to use it) you will need:"
92
- echo -e " $ sudo emerge dev-java/sun-jdk dev-java/sun-jre-bin"
91
+ echo -e " $item For jRuby (if you wish to use it) you will need:"
92
+ echo -e " $ sudo emerge dev-java/sun-jdk dev-java/sun-jre-bin"
93
93
 
94
94
  elif [ ! -z "$rvm_pacman_binary" ] ; then
95
- echo -e " $item For jRuby (if you wish to use it) you will need:"
96
- echo -e " $ sudo pacman -Sy jdk jre"
95
+ echo -e " $item For jRuby (if you wish to use it) you will need:"
96
+ echo -e " $ sudo pacman -Sy jdk jre"
97
97
 
98
98
  elif [ ! -z "$rvm_yum_binary" ] ; then
99
- echo -e " $item For ree (if you wish to use it) you will need:"
100
- echo -e " $ yum install -y rpm-build gcc gcc-c++ redhat-rpm-config ; then download and rpmbuild and install the sdk, Have fun..."
99
+ echo -e " $item For ree (if you wish to use it) you will need:"
100
+ echo -e " $ yum install -y rpm-build gcc gcc-c++ redhat-rpm-config ; then download and rpmbuild and install the sdk, Have fun..."
101
101
 
102
102
  else
103
- echo -e " $item For jRuby (if you wish to use it) you will need:"
104
- echo -e " The SUN java runtime environment and development kit."
103
+ echo -e " $item For jRuby (if you wish to use it) you will need:"
104
+ echo -e " The SUN java runtime environment and development kit."
105
105
  fi
106
- elif [ "$system" = "Darwin" ] ; then
107
- echo -e " $item Be sure that you have XCode Tools installed in order to use rvm."
108
- echo -e " $item If you intend on installing MacRuby you must install LLVM first."
106
+ elif [ "Darwin" = "$system" ] ; then
107
+ echo -e " $item Be sure that you have XCode Tools installed in order to use rvm."
108
+ echo -e " $item If you intend on installing MacRuby you must install LLVM first."
109
109
  fi
110
110
 
111
111
  echo -e " $item In order to use rvm the following line must occur in your shell's loading files, after all path/variable settings.:"
112
112
  echo -e " $item if [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi"
113
113
  echo -e " $item CLOSE THIS SHELL AND OPEN A NEW ONE in order to use rvm."
114
114
 
115
- echo -e "\n \033[0;33mRTFM: \033[0m http://rvm.beginrescueend.com/ \n"
116
- echo -e '\033[0;32mw⦿‿⦿t!\033[0m'
115
+ echo -e "\n \033[0;33mRTFM: $(tput sgr0) http://rvm.beginrescueend.com/ \n"
116
+ echo -e "$(tput setaf 2)w⦿‿⦿t!$(tput sgr0)"
117
117
  echo -e "\n ~ Wayne\n"
118
118
 
119
119
  source $rvm_path/scripts/rvm
data/lib/VERSION.yml CHANGED
@@ -1,4 +1,4 @@
1
1
  ---
2
2
  :major: 0
3
3
  :minor: 0
4
- :patch: 57
4
+ :patch: 58
data/rvm.gemspec CHANGED
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = %q{rvm}
8
- s.version = "0.0.57"
8
+ s.version = "0.0.58"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Wayne E. Seguin"]
12
- s.date = %q{2009-10-10}
12
+ s.date = %q{2009-10-12}
13
13
  s.default_executable = %q{rvm-install}
14
14
  s.description = %q{Manages Ruby interpreter installations and switching between them.}
15
15
  s.email = %q{wayneeseguin@gmail.com}
data/scripts/cli CHANGED
@@ -4,8 +4,8 @@ function __rvm_meta {
4
4
  rvm_meta_author="Wayne E. Seguin"
5
5
  rvm_meta_author_email="wayneeseguin@gmail.com"
6
6
  rvm_meta_website="http://rvm.beginrescueend.com/"
7
- rvm_meta_version="`cat $rvm_path/lib/VERSION.yml | tail -n 3 | sed 's/^.*: //g' | tr "\n" '.' | sed 's/\.$//'`"
8
- rvm_meta_updated="2009.10.10"
7
+ rvm_meta_version="$(cat $rvm_path/lib/VERSION.yml | tail -n 3 | sed 's/^.*: //g' | tr "\n" '.' | sed 's/\.$//')"
8
+ rvm_meta_updated="2009.10.12"
9
9
  }
10
10
 
11
11
  function __rvm_version { __rvm_meta ; echo "rvm $rvm_meta_version ($rvm_meta_updated) [$rvm_meta_website]" ; }
@@ -113,7 +113,7 @@ function __rvm_parse_args {
113
113
 
114
114
  use)
115
115
  rvm_action=$rvm_token
116
- if [ "$1" = "ruby" ] ; then shift ; fi
116
+ if [ "ruby" = "$1" ] ; then shift ; fi
117
117
  ;;
118
118
 
119
119
  inspect)
@@ -142,9 +142,9 @@ function __rvm_parse_args {
142
142
 
143
143
  gems|gemset)
144
144
  rvm_action="gems"
145
- if [ "$1" = "name" -o "$1" = "dir" -o "$1" = "list" -o "$1" = "empty" -o "$1" = "delete" ] ; then
145
+ if [ "name" = "$1" -o "$1" = "dir" -o "$1" = "list" -o "$1" = "empty" -o "$1" = "delete" ] ; then
146
146
  eval "rvm_${1}_flag=1" ; shift
147
- elif [ "$1" = "dump" -o "$1" = "load" ] ; then
147
+ elif [ "dump" = "$1" -o "$1" = "load" ] ; then
148
148
  eval "rvm_${1}_flag=1" ; shift
149
149
  else
150
150
  rvm_use_flag=1 # Default is to use the (named) gem set.
@@ -153,31 +153,25 @@ function __rvm_parse_args {
153
153
 
154
154
  gemdir)
155
155
  rvm_action=$rvm_token
156
- if [ "$1" = "system" ] ; then rvm_ruby_interpreter="system" ; shift ; fi
157
- if [ "$1" = "user" ] ; then rvm_ruby_interpreter="user" ; shift ; fi
156
+ if [ "system" = "$1" ] ; then rvm_ruby_interpreter="system" ; shift ; fi
157
+ if [ "user" = "$1" ] ; then rvm_ruby_interpreter="user" ; shift ; fi
158
158
  rvm_ruby_interpreter="${rvm_ruby_interpreter:-current}"
159
159
  ;;
160
160
 
161
161
  --load|load|dump)
162
162
  rvm_action=gems
163
163
  eval "rvm_${rvm_token}_flag=1"
164
- if [ ! -z "$1" ] ; then
165
- rvm_file_name="$(echo $1 | sed 's/\.gems//').gems"
166
- shift
167
- else
168
- rvm_file_name="$rvm_gem_set_name.gems"
169
- fi
170
164
  ;;
171
165
 
172
166
  gemdup)
173
167
  rvm_action=$rvm_token
174
168
  if [ -z "$1" ] ; then
175
169
  rvm_ruby_interpreter="default"
176
- elif [ "$1" = "system" ] ; then
170
+ elif [ "system" = "$1" ] ; then
177
171
  rvm_ruby_interpreter=$1 ; shift
178
- elif [ "$1" = "user" ] ; then
172
+ elif [ "user" = "$1" ] ; then
179
173
  rvm_ruby_interpreter=$1 ; shift
180
- elif [ "$1" = "default" ] ; then
174
+ elif [ "default" = "$1" ] ; then
181
175
  rvm_ruby_interpreter=$1 ; shift
182
176
  else
183
177
  rvm_ruby_interpreter=$1 ; shift
@@ -186,10 +180,10 @@ function __rvm_parse_args {
186
180
  ;;
187
181
 
188
182
  do|ruby|rake|gem|rubydo|rakedo|gemdo)
189
- if [ "$rvm_action" = "do" ] ; then rvm_action="ruby" ; fi
183
+ if [ "do" = "$rvm_action" ] ; then rvm_action="ruby" ; fi
190
184
  rvm_action=$(echo $rvm_token | sed 's/do//g')
191
185
 
192
- if [ "$rvm_action" = "rake" -o "$rvm_action" = "gem" -o "$rvm_action" = "ruby" ] ; then
186
+ if [ "rake" = "$rvm_action" -o "$rvm_action" = "gem" -o "$rvm_action" = "ruby" ] ; then
193
187
  if [ -z "$1" ] ; then
194
188
  rvm_action="error"
195
189
  rvm_error_message="the 'ruby' and 'gem' actions must be followed by arguments."
@@ -207,7 +201,7 @@ function __rvm_parse_args {
207
201
  rvm_ruby_version=$(echo "$1" | tr ',' ' ') ; shift
208
202
  unset rvm_ruby_interpreter
209
203
  else
210
- if [ "$1" = "jruby" -o "$1" = "rbx" -o "$1" = "rubinius" -o "$1" = "macruby" -o "$1" = "ree" -o "$1" = "ruby-enterprise" ] ; then
204
+ if [ "jruby" = "$1" -o "$1" = "rbx" -o "$1" = "rubinius" -o "$1" = "macruby" -o "$1" = "ree" -o "$1" = "ruby-enterprise" ] ; then
211
205
  rvm_ruby_interpreter=$1 ; shift
212
206
  else
213
207
  unset rvm_ruby_interpreter rvm_ruby_version
@@ -233,9 +227,9 @@ function __rvm_parse_args {
233
227
  ;;
234
228
 
235
229
  1.2.0|1.3|1.3.0|1.3.1|1.4|1.4.0)
236
- if [ "$rvm_token" = "1.3" ] ; then
230
+ if [ "1.3" = "$rvm_token" ] ; then
237
231
  rvm_ruby_version="1.3.1"
238
- elif [ "$rvm_token" = "1.4" ] ; then
232
+ elif [ "1.4" = "$rvm_token" ] ; then
239
233
  rvm_ruby_version="1.4.0"
240
234
  else
241
235
  rvm_ruby_version="$rvm_token"
@@ -282,7 +276,7 @@ function __rvm_parse_args {
282
276
  ;;
283
277
 
284
278
  --bin)
285
- if [ "$rvm_action" = "update" ] ; then
279
+ if [ "update" = "$rvm_action" ] ; then
286
280
  rvm_bin_flag=1
287
281
  else
288
282
  rvm_bin_path="$1" ; shift
@@ -357,6 +351,7 @@ function __rvm_parse_args {
357
351
  --make-install) rvm_ruby_make_install="$1"; shift ;;
358
352
  --nice) rvm_niceness="$1" ; shift ;;
359
353
  -l|--level) rvm_ruby_patch_level="$1" ; shift ;;
354
+ # TODO: handle this below better (if $1 is null)
360
355
  -m|--gem-set) rvm_gem_set_name="$1" ; shift ;;
361
356
  tests|specs) rvm_action="tests" ;;
362
357
 
@@ -372,9 +367,14 @@ function __rvm_parse_args {
372
367
  $rvm_action="reboot"
373
368
  ;;
374
369
 
370
+ --)
371
+ rvm_ruby_args="$*"
372
+ rvm_parse_break=1
373
+ ;;
374
+
375
375
  *)
376
376
  if [ ! -z "$rvm_token" ] ; then
377
- if [ "$rvm_action" = "gems" ] ; then
377
+ if [ "gems" = "$rvm_action" ] ; then
378
378
  if [ -z "$(echo $rvm_token | awk '/\.gems$/')" ] ; then
379
379
  rvm_gem_set_name=$(echo $rvm_token | sed 's/\.gems//g')
380
380
  else
@@ -386,7 +386,7 @@ function __rvm_parse_args {
386
386
  rvm_action="do" # Not sure if we really want to do this but we'll try it out.
387
387
  fi
388
388
  else
389
- if [ ! -z "`echo $rvm_token | awk '/\.rb$/{print}' 2> /dev/null`" ] ; then # we have a specified ruby script
389
+ if [ ! -z "$(echo $rvm_token | awk '/\.rb$/{print}' 2> /dev/null)" ] ; then # we have a specified ruby script
390
390
  rvm_ruby_args=$rvm_token
391
391
  rvm_ruby_file=$rvm_token
392
392
  if [ -z "$rvm_action" ] ; then
@@ -401,7 +401,7 @@ function __rvm_parse_args {
401
401
  rvm_action="error"
402
402
  rvm_error_message="Unrecognized command line argument(s): '$rvm_token $@'"
403
403
  fi
404
- if [ "$rvm_action" = "error" ] ; then
404
+ if [ "error" = "$rvm_action" ] ; then
405
405
  break;
406
406
  fi
407
407
 
@@ -451,7 +451,7 @@ function rvm {
451
451
  ;;
452
452
 
453
453
  gemsync)
454
- rvm_source_gem_path=`__rvm_select ; echo $rvm_ruby_gem_home`
454
+ rvm_source_gem_path=$(__rvm_select ; echo $rvm_ruby_gem_home)
455
455
  __rvm_gem_sync
456
456
  ;;
457
457
 
@@ -464,7 +464,7 @@ function rvm {
464
464
  info|debug)
465
465
  __rvm_version
466
466
  __rvm_info
467
- if [ "$rvm_action" = "debug" ] ; then rvm_debug_flag=1 ; __rvm_debug ; fi
467
+ if [ "debug" = "$rvm_action" ] ; then rvm_debug_flag=1 ; __rvm_debug ; fi
468
468
  ;;
469
469
 
470
470
  error)
@@ -482,7 +482,7 @@ function rvm {
482
482
  result=1
483
483
  esac
484
484
 
485
- if [ "$rvm_trace_flag" = "1" ] ; then set +x ; unset rvm_trace_flag ; fi
485
+ if [ "1" = "$rvm_trace_flag" ] ; then set +x ; unset rvm_trace_flag ; fi
486
486
 
487
487
  return $result
488
488
  }
data/scripts/completion CHANGED
@@ -90,8 +90,6 @@ _rvm ()
90
90
  --nice) rvm_niceness="$1" ; shift ;;
91
91
  -l|--level) rvm_ruby_patch_level="$1" ; shift ;;
92
92
  -h|--help) rvm_action=help ; shift ;;
93
- -m|--gem-set) rvm_gem_set_name="$1" ; shift ;;
94
- --rm-gem-set) rvm_gem_set_name_rm="$1" ; shift ;;
95
93
  tests|specs) rvm_action="tests" ;;
96
94
 
97
95
  --self|--gem|--rubygems|--reconfigure|--default|--debug|debug|--force|--all|--dump|--summary|--jit|--latest|--yaml|yaml|--json|json)
@@ -162,7 +160,7 @@ function _rvm {
162
160
 
163
161
  gemsync)
164
162
  result=0
165
- rvm_source_gem_path=`__rvm_select ; echo $rvm_gem_home`
163
+ rvm_source_gem_path="$(__rvm_select ; echo $rvm_gem_home)"
166
164
  __rvm_gem_sync
167
165
  ;;
168
166
 
@@ -175,7 +173,7 @@ function _rvm {
175
173
  info|debug)
176
174
  __rvm_version
177
175
  __rvm_info
178
- if [ "$rvm_action" = "debug" ] ; then __rvm_debug ; fi
176
+ if [ "debug" = "$rvm_action" ] ; then __rvm_debug ; fi
179
177
  result=0
180
178
  ;;
181
179
 
data/scripts/gems CHANGED
@@ -23,8 +23,8 @@ __rvm_gems() {
23
23
 
24
24
  __rvm_gems_select() {
25
25
  if [ -z "$rvm_gem_set_name" ] ; then
26
- if [ -z "$rvm_gem_set_name" -a ! -z "$rvm_ruby_gem_home" -a ! -z "$rvm_ruby_version" ] ; then
27
- rvm_gem_set_name=$(echo $rvm_ruby_gem_home | xargs basename | sed "s/${rvm_ruby_version}-//")
26
+ if [ ! -z "$rvm_ruby_gem_home" -a ! -z "$rvm_ruby_version" ] ; then
27
+ rvm_gem_set_name=$(echo $rvm_ruby_gem_home | xargs basename | sed "s/${rvm_ruby_version}[-]*//")
28
28
  fi
29
29
 
30
30
  if [ -z "$rvm_gem_set_name" ] ; then unset rvm_gem_set_name ; fi
@@ -157,13 +157,13 @@ __rvm_gems_delete () {
157
157
  if [ ! -z "$rvm_gem_set_name" ] ; then
158
158
  gemdir="$rvm_gem_path/$rvm_ruby_interpreter/$rvm_ruby_version-$rvm_gem_set_name"
159
159
  if [ -d "$gemdir" -a ! -z "$rvm_force_flag" ] ; then
160
- rm -rf $gemdir
160
+ rm -rf "$gemdir"
161
161
  elif [ -d "$gemdir" ] ; then
162
162
  __rvm_log "warn" "Are you SURE you wish to remove the installed gems '$rvm_gem_set_name ' ($gemdir)?"
163
163
  echo -n "(anything other than 'yes' will cancel) > "
164
164
  read response
165
- if [ "$response" = "yes" ] ; then
166
- rm -rf $gemdir
165
+ if [ "yes" = "$response" ] ; then
166
+ rm -rf "$gemdir"
167
167
  else
168
168
  __rvm_log "info" "Not doing anything, phew... close call that one eh?"
169
169
  fi
data/scripts/install CHANGED
@@ -1,21 +1,21 @@
1
1
  #!/bin/bash
2
2
 
3
- user=`whoami`
4
- if [ "$user" = "root" ] ; then
5
- echo -e "\033[0;31m <e> \033[0mroot user support is not yet implemented.\033[0m"
3
+ user="$(whoami)"
4
+ if [ "root" = "$user" ] ; then
5
+ echo -e "$(tput setaf 1) <e> root user support is not yet implemented.$(tput sgr0)"
6
6
  exit 1
7
7
  fi
8
8
 
9
- item="\033[0;32m* \033[0m"
10
- question="\n\033[0;32m<?>\033[0m"
9
+ item="$(tput setaf 2)* $(tput sgr0)"
10
+ question="\n$(tput setaf 2)<?>$(tput sgr0)"
11
11
  cwd=$(pwd)
12
- source_dir="${source_dir:-`dirname $0 | xargs dirname`}"
12
+ source_dir="${source_dir:-"$(dirname $0 | xargs dirname)"}"
13
13
  if [ ! -d "$source_dir" ] ; then unset source_dir ; fi
14
14
  source_dir="${source_dir:-$cwd}"
15
15
  rvm_path=~/.rvm
16
16
 
17
17
  # State what is required to use rvm
18
- echo -e "\n\033[0;32mrvm\033[0m\n\n shell scripts that allows a user to manage multiple ruby versions in their own account."
18
+ echo -e "\n$(tput setaf 2)rvm$(tput sgr0)\n\n shell scripts that allows a user to manage multiple ruby versions in their own account."
19
19
  echo -e "\n Installing rvm to ~/.rvm/ ..."
20
20
  for dir_name in src scripts bin log archives config gems examples ; do
21
21
  mkdir -p $rvm_path/$dir_name
@@ -46,7 +46,7 @@ echo -e "\n Ensuring that rvm script location in $file is scripts/rvm not bin
46
46
  for file in ~/.bash_profile ~/.bashrc ~/.zshrc ; do
47
47
  if [ -s $file ] ; then
48
48
  if [ -L $file ] ; then # If the file is a symlink,
49
- actual_file=`readlink $file` # read the link target so we can preserve it.
49
+ actual_file="$(readlink $file)" # read the link target so we can preserve it.
50
50
  else
51
51
  actual_file="$file"
52
52
  fi
@@ -73,47 +73,47 @@ if [ -f ~/.rvm/bin/rvm ] ; then
73
73
  rm -f ~/.rvm/bin/rvm
74
74
  fi
75
75
 
76
- system=`uname`
77
- echo -e "\n \033[0;33mNOTES: \033[0m"
78
- if [ "$system" = "Linux" ] ; then
79
- rvm_apt_get_binary=`which apt-get 2> /dev/null`
80
- rvm_emerge_binary=`which emerge 2> /dev/null`
81
- rvm_pacman_binary=`which pacman 2> /dev/null`
82
- rvm_yum_binary=`which yum 2> /dev/null`
76
+ system="$(uname)"
77
+ echo -e "\n $(tput setaf 3)NOTES: $(tput sgr0)\n"
78
+ if [ "Linux" = "$system" ] ; then
79
+ rvm_apt_get_binary="$(which apt-get 2> /dev/null)"
80
+ rvm_emerge_binary="$(which emerge 2> /dev/null)"
81
+ rvm_pacman_binary="$(which pacman 2> /dev/null)"
82
+ rvm_yum_binary="$(which yum 2> /dev/null)"
83
83
 
84
84
  if [ ! -z "$rvm_apt_get_binary" ] ; then
85
- echo -e " $item For jRuby (if you wish to use it) you will need:"
86
- echo -e " $ sudo apt-get install sun-java6-bin sun-java6-jre sun-java6-jdk"
87
- echo -e " $item For ree (if you wish to use it) you will need:"
88
- echo -e " $ sudo apt-get install libreadline5-dev libssl-dev bison"
85
+ echo -e " $item For jRuby (if you wish to use it) you will need:"
86
+ echo -e " $ sudo apt-get install sun-java6-bin sun-java6-jre sun-java6-jdk"
87
+ echo -e " $item For ree (if you wish to use it) you will need:"
88
+ echo -e " $ sudo apt-get install libreadline5-dev libssl-dev bison"
89
89
 
90
90
  elif [ ! -z "$rvm_emerge_binary" ] ; then
91
- echo -e " $item For jRuby (if you wish to use it) you will need:"
92
- echo -e " $ sudo emerge dev-java/sun-jdk dev-java/sun-jre-bin"
91
+ echo -e " $item For jRuby (if you wish to use it) you will need:"
92
+ echo -e " $ sudo emerge dev-java/sun-jdk dev-java/sun-jre-bin"
93
93
 
94
94
  elif [ ! -z "$rvm_pacman_binary" ] ; then
95
- echo -e " $item For jRuby (if you wish to use it) you will need:"
96
- echo -e " $ sudo pacman -Sy jdk jre"
95
+ echo -e " $item For jRuby (if you wish to use it) you will need:"
96
+ echo -e " $ sudo pacman -Sy jdk jre"
97
97
 
98
98
  elif [ ! -z "$rvm_yum_binary" ] ; then
99
- echo -e " $item For ree (if you wish to use it) you will need:"
100
- echo -e " $ yum install -y rpm-build gcc gcc-c++ redhat-rpm-config ; then download and rpmbuild and install the sdk, Have fun..."
99
+ echo -e " $item For ree (if you wish to use it) you will need:"
100
+ echo -e " $ yum install -y rpm-build gcc gcc-c++ redhat-rpm-config ; then download and rpmbuild and install the sdk, Have fun..."
101
101
 
102
102
  else
103
- echo -e " $item For jRuby (if you wish to use it) you will need:"
104
- echo -e " The SUN java runtime environment and development kit."
103
+ echo -e " $item For jRuby (if you wish to use it) you will need:"
104
+ echo -e " The SUN java runtime environment and development kit."
105
105
  fi
106
- elif [ "$system" = "Darwin" ] ; then
107
- echo -e " $item Be sure that you have XCode Tools installed in order to use rvm."
108
- echo -e " $item If you intend on installing MacRuby you must install LLVM first."
106
+ elif [ "Darwin" = "$system" ] ; then
107
+ echo -e " $item Be sure that you have XCode Tools installed in order to use rvm."
108
+ echo -e " $item If you intend on installing MacRuby you must install LLVM first."
109
109
  fi
110
110
 
111
111
  echo -e " $item In order to use rvm the following line must occur in your shell's loading files, after all path/variable settings.:"
112
112
  echo -e " $item if [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi"
113
113
  echo -e " $item CLOSE THIS SHELL AND OPEN A NEW ONE in order to use rvm."
114
114
 
115
- echo -e "\n \033[0;33mRTFM: \033[0m http://rvm.beginrescueend.com/ \n"
116
- echo -e '\033[0;32mw⦿‿⦿t!\033[0m'
115
+ echo -e "\n \033[0;33mRTFM: $(tput sgr0) http://rvm.beginrescueend.com/ \n"
116
+ echo -e "$(tput setaf 2)w⦿‿⦿t!$(tput sgr0)"
117
117
  echo -e "\n ~ Wayne\n"
118
118
 
119
119
  source $rvm_path/scripts/rvm