Skip to content

Commit

Permalink
Correctly infer $rvm_user_install_flag when performing a root-only …
Browse files Browse the repository at this point in the history
…install according to instructions on FAQ.
  • Loading branch information
JoeKun authored and Joel Lopes Da Silva committed Apr 29, 2013
1 parent eaecced commit 0a71eab
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 3 deletions.
16 changes: 15 additions & 1 deletion binscripts/rvm-installer
Expand Up @@ -272,7 +272,7 @@ fi

# Variable initialization, remove trailing slashes if they exist on HOME
true \
${rvm_trace_flag:=0} ${rvm_debug_flag:=0} ${rvm_user_install_flag:=0}\
${rvm_trace_flag:=0} ${rvm_debug_flag:=0}\
${rvm_ignore_rvmrc:=0} HOME="${HOME%%+(\/)}"


Expand Down Expand Up @@ -314,6 +314,20 @@ if [[ -z "${rvm_prefix}" ]]
then
rvm_prefix=$( dirname $rvm_path )
fi

# duplication marker kkdfkgnjfndgjkndfjkgnkfjdgn
# guess rvm_user_install_flag if not set
if
[[ -z "${rvm_user_install_flag}" ]]
then
if
[[ "${rvm_prefix}" == "${HOME}" ]]
then
rvm_user_install_flag=1
else
rvm_user_install_flag=0
fi
fi

install_rubies=()
install_gems=()
Expand Down
7 changes: 5 additions & 2 deletions scripts/rvm
Expand Up @@ -92,10 +92,13 @@ then
rvm_prefix=$( dirname $rvm_path )
fi

# duplication marker kkdfkgnjfndgjkndfjkgnkfjdgn
# guess rvm_user_install_flag if not set
if [[ -z "${rvm_user_install_flag}" ]]
if
[[ -z "${rvm_user_install_flag}" ]]
then
if [[ "${rvm_prefix}" == "${HOME}" ]]
if
[[ "${rvm_prefix}" == "${HOME}" ]]
then
rvm_user_install_flag=1
else
Expand Down

0 comments on commit 0a71eab

Please sign in to comment.