Only for ruby interpreter use svn like branch calculation.

rvm · Jan 13, 2011 · 3bcc697 · 3bcc697
1 parent fc6a44c
commit 3bcc697
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 13 deletions.
diff --git a/scripts/info b/scripts/info
@@ -156,7 +156,11 @@ info_sections()
 
   for section in $(printf "${sections//,/ }") ; do
 
-    rvm_info="" ; "info_${section}" ; printf "$rvm_info"
+    rvm_info=""
+
+    "info_${section}"
+
+    printf "$rvm_info"
 
   done
 

diff --git a/scripts/manage b/scripts/manage
@@ -1405,24 +1405,38 @@ __rvm_fetch_ruby()
 
     if echo "$rvm_ruby_url" | grep -q 'git' ; then # Using a  git url.
 
-      # Determine Branch
-      if [[ -z "${rvm_ruby_repo_branch:-""}" ]]; then
+      case "$rvm_ruby_interpreter" in
 
-        if [[ -n "${rvm_ruby_major_version:-""}" ]] ; then
+        ruby)
+          # Determine Branch
+          if [[ -z "${rvm_ruby_repo_branch:-""}" ]]; then
 
-          if [[ -n "${rvm_ruby_minor_version:-""}" ]]; then
-            rvm_ruby_repo_branch="ruby_1_${rvm_ruby_major_version}_${rvm_ruby_minor_version}"
-          else
-            rvm_ruby_repo_branch="ruby_1_${rvm_ruby_major_version}"
-          fi
+            if [[ -n "${rvm_ruby_major_version:-""}" ]] ; then
 
-        else
+              if [[ -n "${rvm_ruby_minor_version:-""}" ]]; then
 
-          rvm_ruby_repo_branch="trunk" # NOTE: Ruby Core team maps 'trunk' as HEAD
+                rvm_ruby_repo_branch="ruby_1_${rvm_ruby_major_version}_${rvm_ruby_minor_version}"
 
-        fi
+              else
 
-      fi
+                rvm_ruby_repo_branch="ruby_1_${rvm_ruby_major_version}"
+
+              fi
+
+            else
+
+              rvm_ruby_repo_branch="trunk" # NOTE: Ruby Core team maps 'trunk' as HEAD
+
+            fi
+
+          fi
+          ;;
+
+        ree|jruby|maglev|*)
+          rvm_ruby_repo_branch="${rvm_ruby_repo_branch:-"master"}"
+          ;;
+
+      esac
 
       # Clone if repository does not yet exist locally
       if [[ ! -d "${rvm_repos_path:-"$rvm_path/repos"}/$rvm_ruby_string/.git" ]] ; then