Merge branch 'master' of github.com:wayneeseguin/rvm

rvm · Apr 27, 2011 · f013644 · f013644
2 parents 528f7ed + 80f9855
commit f013644
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/scripts/functions/environment b/scripts/functions/environment
@@ -237,8 +237,10 @@ __rvm_teardown()
 
   if [[ -n "${ZSH_VERSION:-""}" ]]
   then
-    (( rvm_zsh_clobber > 0 )) || setopt noclobber
-    (( rvm_zsh_nomatch > 0 )) || setopt nomatch
+    # If rvm_zsh_clobber is 0 then "setopt" contained "noclobber" before rvm performed "setopt clobber".
+    (( rvm_zsh_clobber == 0 )) && setopt noclobber
+    # If rvm_zsh_nomatch is 0 then "setopt" contained "nonomatch" before rvm performed "setopt nonomatch".
+    (( rvm_zsh_nomatch == 0 )) || setopt nomatch
 
     unset rvm_zsh_clobber rvm_zsh_nomatch
   else

diff --git a/scripts/notes b/scripts/notes
@@ -89,10 +89,11 @@ dependencies:
     printf "
 dependencies:
   # For RVM
-  rvm: yum install -y bash curl git
+  rvm: yum install -y bash curl git # NOTE: For git you need the EPEL repository enabled
 
   # For Ruby (MRI & Ree) you should install the following OS dependencies:
   ruby: yum install -y gcc-c++ patch readline readline-devel zlib zlib-devel libyaml-devel libffi-devel openssl-devel ;
+        yum install -y make bzip2 ;
         yum install -y iconv-devel # NOTE: For centos 5.4 final iconv-devel might not be available :(
 
   # For JRuby (if you wish to use it) you will need: