Skip to content

Commit

Permalink
Fixes RVM package fails to configure on fresh Ubuntu 18.04 server ins…
Browse files Browse the repository at this point in the history
…tall (#4742)

Reverts #4612 and reopens #3410
  • Loading branch information
pkuczynski committed Jul 23, 2019
2 parents 4e263fc + 7a3d156 commit ec3b431
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 27 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Expand Up @@ -12,6 +12,7 @@
#### Bug fixes
* Fix installer fetching RVM tags from Bitbucket [\#4730](https://github.com/rvm/rvm/pull/4730)
* Prevent downloading of null RVM versions in installer [\#4731](https://github.com/rvm/rvm/pull/4731)
* RVM package fails to configure on fresh Ubuntu 18.04 server install [\#4742](https://github.com/rvm/rvm/pull/4742)

#### Changes
* Installer now reports which URL(s) have failed to fetch version information and when version fetching has completely failed [\#4731](https://github.com/rvm/rvm/pull/4731)
Expand Down
26 changes: 13 additions & 13 deletions binscripts/rvm-installer.asc
@@ -1,16 +1,16 @@
-----BEGIN PGP SIGNATURE-----

iQIzBAABCAAdFiEEfSuvHPN7E+IGnWlWEFvQ5zlJm9sFAl0sq7MACgkQEFvQ5zlJ
m9srhg//av/KkcTZS8xg+BS3S7KqX/8pnvcxQz/eMkGoDftR4NjN6gdqny+5/+Zn
fs35dbNMOhKkgH1gv3BPYE4y1JR1VU8IZRAZB9Kd++s6+dAg5hdgRY7QjjYzmvaw
cupWxvBM0Hj+aTjbVXuezTTjsDcuvYnZIybXh6HF+b/idGklV++a+Xn5Z3/cI361
DRqjId2xAfUAZ5nk+5nCDXeoJg4QchMduQoMAMvHAnvD8Yxna7h5wtfrWF7lEfVm
wBTOo2SE0gaZECHg1cT98RAwMixZevSncABEcmKs8iMe4/VQhHit71vnEXmxJH21
CGoBc83eNnmnCd6kXr6IZnHryPRDroz8pyALMBOhFOceJu5iGMq7V5Lz3UArRwSY
hevWUsaxGgPiKONRU27UhER6yU9dSoXU2hXwUnQn68DGy2lRTcU0I0xCnFUCnw0B
PSklZAtVxuU6GNrQJb/fMEpM6nH4oI0JB7SRuGl2Xmkcl84axVnAhTT8Fac/9l/g
I4UwFvLJoxCFh1aIROJlPTKjs5j5jLY2wCHQxt6tJT1Z5Io42fyvuU/AnfQVOOUY
nCkzLJFpwnclabPfdgc7wLzy/nmd2W1AVgeVaVAsgG9Lb44wNWC/h4cl3sA0xrxq
Ecn4s48E4dqcFD0gf/+vE57XIWZ2BnZzlJHw/CapZRexTzrIK2I=
=pkFU
iQIzBAABCAAdFiEEfSuvHPN7E+IGnWlWEFvQ5zlJm9sFAl03g1EACgkQEFvQ5zlJ
m9uBUxAAzVpuznkfRKSVcKVCIVi84mcNg4+Ju31ToFXAYxjNiPfWQcB5LOwrK+o+
IiWACs4rQ2W725Mv+xKat9k0Ex7HMFDHJiAoj/SQd0NYJkrNArsl9sMoV4E2QRPY
iQK2yVfyEnM+pQcMYLG2YwfYgJNGZO5GfEBVMIlZe59xi9GGMMpVNuZzQPLEDLko
Tu4MwwjuOeJezT9vWYCy8kOb7yip1STrQrNXdXPpZRjC8zumFpeFTjjCUrUaqVup
ejl9GHAgFBK7vs2SH6yyonwwbJjgvFNGz0hUieHZsokMLnYpSq9FTohCTTLFeIED
z7XYcX6LvYoyjnq/OoITx58uAjaG/FAqgV9mDZBMYVU1ndUVRnu01YjaNfzFFisU
V4QLnnsTrpihMkcBnUZFcNMXeUCbGRBdKyouMyDZN1pS6OZfZwrT9F/rhaIuBnUu
KSBNng8ER+3ITA+tG9mRj7dJnH3lsVWFwjwMFtTjGcgYPktHt5OoSbEn8LGN6oIN
SwufLKW2VbPQyZZ3Yafmrbgmy34k14+RU09D3AYvPr3f6cX4nG6oA7YXSGsrhS6C
aFb9XzTUWnotB0BaeaC6Jwe8Bi496BQyCmLrvX/aLpzV2fZXtz7puyJACOPv02JI
xY4zM9PCgTozc/NLuRNGLDj/iPfyN6fm0ey7wljPJpeZgg0asZ0=
=Sr0u
-----END PGP SIGNATURE-----
2 changes: 1 addition & 1 deletion scripts/functions/environment
Expand Up @@ -249,7 +249,7 @@ __rvm_teardown()
# decrease load count counter
: __rvm_env_loaded:$(( __rvm_env_loaded-=1 )):

#skip teardown when already done or when not yet finished
# skip teardown when already done or when not yet finished
if [[ -z "${rvm_tmp_path:-}" ]] || (( __rvm_env_loaded > 0 ))
then return 0
fi
Expand Down
26 changes: 13 additions & 13 deletions scripts/functions/installer
Expand Up @@ -848,6 +848,19 @@ if
then
[[ -n \"\${rvm_stored_umask:-}\" ]] || export rvm_stored_umask=\$(umask)
# Load user rvmrc configurations, if exist
for file in \"/etc/rvmrc\" \"\$HOME/.rvmrc\"
do
[[ -s \"\$file\" ]] && source \$file
done
if
[[ -n \"\${rvm_prefix:-}\" ]] &&
[[ -s \"\${rvm_prefix}/.rvmrc\" ]] &&
[[ ! \"\$HOME/.rvmrc\" -ef \"\${rvm_prefix}/.rvmrc\" ]]
then
source \"\${rvm_prefix}/.rvmrc\"
fi
# Load RVM if it is installed, try user then root install
if
[[ -s \"\$rvm_path/scripts/rvm\" ]]
Expand All @@ -865,19 +878,6 @@ then
source \"/usr/local/rvm/scripts/rvm\"
fi
# Load user rvmrc configurations, if exist
for file in \"/etc/rvmrc\" \"\$HOME/.rvmrc\"
do
[[ -s \"\$file\" ]] && source \$file
done
if
[[ -n \"\${rvm_prefix:-}\" ]] &&
[[ -s \"\${rvm_prefix}/.rvmrc\" ]] &&
[[ ! \"\$HOME/.rvmrc\" -ef \"\${rvm_prefix}/.rvmrc\" ]]
then
source \"\${rvm_prefix}/.rvmrc\"
fi
# Add \$rvm_bin_path to \$PATH if necessary. Make sure this is the last PATH variable change
if [[ -n \"\${rvm_bin_path}\" && ! \":\${PATH}:\" == *\":\${rvm_bin_path}:\"* ]]
then PATH=\"\${PATH}:\${rvm_bin_path}\"
Expand Down

0 comments on commit ec3b431

Please sign in to comment.