Permalink
Browse files

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

  • Loading branch information...
2 parents e8aa304 + 1359cf5 commit 5ae1b11ba4b148415e8d9b5c0882b7838f855107 @wayneeseguin wayneeseguin committed May 20, 2011
Showing with 12 additions and 11 deletions.
  1. +1 −1 config/db
  2. +1 −1 config/known
  3. +6 −6 config/md5
  4. +1 −1 contrib/ps1_functions
  5. +1 −1 scripts/functions/installer
  6. +2 −1 scripts/manage
View
@@ -54,7 +54,7 @@ macruby_nightly_version=0.11
macruby_url=http://www.macruby.org/files
macruby_repo_url=git://github.com/MacRuby/MacRuby.git
macruby_nightly_url=http://www.macruby.org/files/nightlies/macruby_nightly-latest.pkg
-maglev_version=25838
+maglev_version=25876
maglev_url=http://glass-downloads.gemstone.com/maglev
maglev_repo_url=git://github.com/MagLev/maglev.git
ironruby_version=1.0
View
@@ -41,7 +41,7 @@ ree-1.8.7-head
kiji
# MagLev
-maglev[-25838]
+maglev[-25876]
maglev-head
# Mac OS X Snow Leopard Only
View
@@ -155,9 +155,9 @@ rubygems-1.6.1.tgz=a77c64896aaa10d64aaf34f5c1488173
rubygems-1.6.2.tgz=0c95a9869914ba1a45bf71d3b8048420
zlib-1.2.3.tar.gz=debc62758716a169df9f62e6ab2bc634
zlib-1.2.5.tar.gz=c735eab2d659a96e5a594c9e8541ad63
-GemStone-25838.Darwin-i386.tar.gz=1a9bb982f910aa2b5df3f671fa9f04d9
-GemStone-25838.Linux-x86_64.tar.gz=bf27a8adaaec085c19c839cf91839ce5
-GemStone-25838.SunOS-i86pc.tar.gz=abb4087d7123463bb24a5d86389a92e5
-MagLev-25838.Darwin-i386.tar.gz=970bab94fcdc9d4c31f57ec1a3fb73f0
-MagLev-25838.Linux-x86_64.tar.gz=950f64d7fc204bcdc38f168fc1771066
-MagLev-25838.SunOS-i86pc.tar.gz=f479b2634fa114503d79d9cb37519fb2
+GemStone-25876.Darwin-i386.tar.gz=44e8615c881aed647a19d3d027bb22f0
+GemStone-25876.Linux-x86_64.tar.gz=d3858f5523a476a70f521ff891410505
+GemStone-25876.SunOS-i86pc.tar.gz=acf26f0de97cd2e14c1518f715a046ce
+MagLev-25876.Darwin-i386.tar.gz=157f466bd04502716c5da518056bfbf8
+MagLev-25876.Linux-x86_64.tar.gz=e6c3c0f5b670a902207581870531c20d
+MagLev-25876.SunOS-i86pc.tar.gz=4cb7700eba33789c383baa7b77d612bb
View
@@ -64,7 +64,7 @@ ps1_git()
production|prod) attr="1;37m\033[" ; color=41 ;; # red
master|deploy) color=31 ;; # red
stage|staging) color=33 ;; # yellow
- dev|development) color=34 ;; # blue
+ dev|develop|development) color=34 ;; # blue
next) color=36 ;; # gray
*)
if [[ -n "${branch}" ]] ; then # Feature Branch :)
@@ -643,7 +643,7 @@ install_man_pages()
printf "\n Copying manpages into place.\n"
files=($(
- cd "$install_source_path/man" ;
+ builtin cd "$install_source_path/man" ;
find . -maxdepth 2 -mindepth 1 -type f -print
))
View
3 scripts/manage 100755 → 100644
@@ -1354,7 +1354,8 @@ __rvm_fetch_ruby()
fi
;;
tar.bz2)
- __rvm_run "extract" "bunzip2 < '${rvm_archives_path}/$rvm_ruby_package_file.$rvm_archive_extension' | tar xf - -C ${rvm_tmp_path:-/tmp}/rvm_src_$$" "$rvm_ruby_string - #extracting $rvm_ruby_package_file to ${rvm_src_path}/$rvm_ruby_string"
+ __rvm_run "extract" "bunzip2 '${rvm_archives_path}/$rvm_ruby_package_file.$rvm_archive_extension'"
+ __rvm_run "extract" "tar xf ${rvm_archives_path}/$rvm_ruby_package_file.tar -C ${rvm_tmp_path:-/tmp}/rvm_src_$$" "$rvm_ruby_string - #extracting $rvm_ruby_package_file to ${rvm_src_path}/$rvm_ruby_string"
result=$?
if (( result > 0 ))

0 comments on commit 5ae1b11

Please sign in to comment.