Permalink
Browse files

Sync with RVM-1.12.2

Sync with RVM-1.12.2 and make sure 'rvm-installer' grabs from this
repository.
  • Loading branch information...
1 parent 33cb9dd commit 244516e5785f405cf4eb0d292398a6fa0e85e80a @xiy committed Apr 12, 2012
View
@@ -1 +1 @@
-1.11.7
+1.12.2-openshift
View
@@ -39,8 +39,8 @@ Options
Actions
- master - Install RVM master branch from wayneeseguin rvm repo (Default).
- stable - Install RVM stable branch from wayneeseguin rvm repo.
+ master - Install RVM master branch from xiy rvm repo (Default).
+ stable - Install RVM stable branch from xiy rvm repo.
help - Display CLI help (this output)
Branches:
@@ -53,7 +53,7 @@ Branches:
Defaults:
branch: master
- repo: wayneeseguin
+ repo: xiy
"
}
@@ -64,7 +64,7 @@ Branches:
# fetch_version "" -> 2.0.1
fetch_version()
{
- curl -s https://api.github.com/repos/wayneeseguin/rvm/tags |
+ curl -s https://api.github.com/repos/xiy/rvm/tags |
sed -n '/"name": / {s/^.*".*": "\(.*\)".*$/\1/; p;}' |
sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n -k 5,5n |
grep "^${1:-}" | tail -n 1
@@ -76,17 +76,17 @@ install_release()
_version=$1
log "Downloading RVM version ${_version}"
get_and_unpack \
- https://github.com/wayneeseguin/rvm/tarball/${_version} \
+ https://github.com/xiy/rvm/tarball/${_version} \
rvm-${_version}.tar.gz \
- wayneeseguin-rvm-
+ xiy-rvm-
}
install_head()
{
typeset _repo _branch
case "$1" in
(/*)
- _repo=wayneeseguin
+ _repo=xiy
_branch=${1#/}
;;
(*/)
@@ -98,7 +98,7 @@ install_head()
_branch=${1#*/}
;;
(*)
- _repo=wayneeseguin
+ _repo=xiy
_branch=$1
;;
esac
@@ -208,7 +208,7 @@ then
rvm_path="$OPENSHIFT_DATA_DIR/.rvm"
fi
fi
-export HOME rvm_path
+export $OPENSHIFT_DATA_DIR rvm_path
install_rubies=()
install_gems=()
@@ -268,7 +268,7 @@ __rvm_install_source()
export GEM_PATH="$rvm_ruby_gem_path"
(
- __rvm_use
+ rvm_create_flag=1 __rvm_use
"$rvm_scripts_path/rubygems" ${rvm_rubygems_version:-latest}
)
result=$?
@@ -99,7 +99,10 @@ goruby_install()
export GEM_HOME="$rvm_ruby_gem_home"
export GEM_PATH="$rvm_ruby_gem_path"
- "$rvm_scripts_path/rubygems" latest
+ (
+ rvm_create_flag=1 __rvm_use
+ "$rvm_scripts_path/rubygems" ${rvm_rubygems_version:-latest}
+ )
__rvm_bin_script
@@ -118,6 +118,10 @@ chmod +x "$rvm_ruby_home/bin/ir"
ln -fs "$rvm_ruby_home/bin/ir" "$rvm_ruby_home/bin/ruby"
+(
+ rvm_create_flag=1 __rvm_use
+)
+
builtin hash -r
__rvm_run "gems.install" \
@@ -98,7 +98,7 @@ jruby_install()
__rvm_bin_script
- __rvm_use
+ rvm_create_flag=1 __rvm_use
__rvm_post_install
@@ -148,5 +148,5 @@ maglev_install()
__rvm_bin_script
- __rvm_use
+ rvm_create_flag=1 __rvm_use
}
@@ -94,7 +94,7 @@ ree_install()
chmod +x "$rvm_ruby_home"/bin/*
(
- __rvm_use
+ rvm_create_flag=1 __rvm_use
"$rvm_scripts_path/rubygems" ${rvm_rubygems_version:-latest}
)
__rvm_bin_script
@@ -227,6 +227,10 @@ rbx_install()
unset file_name
+ (
+ rvm_create_flag=1 __rvm_use
+ )
+
binaries=(erb ri rdoc)
__rvm_post_install

0 comments on commit 244516e

Please sign in to comment.