mirror of
https://github.com/valitydev/salt.git
synced 2024-11-09 01:36:48 +00:00
Merge pull request #20454 from scream3/develop
RVM user-only installation is broken
This commit is contained in:
commit
3b1ff444d4
@ -29,7 +29,7 @@ def _get_rvm_location(runas=None):
|
|||||||
if runas:
|
if runas:
|
||||||
runas_home = os.path.expanduser('~{0}'.format(runas))
|
runas_home = os.path.expanduser('~{0}'.format(runas))
|
||||||
rvmpath = '{0}/.rvm/bin/rvm'.format(runas_home)
|
rvmpath = '{0}/.rvm/bin/rvm'.format(runas_home)
|
||||||
if os.path.isdir(rvmpath):
|
if os.path.exists(rvmpath):
|
||||||
return rvmpath
|
return rvmpath
|
||||||
return '/usr/local/rvm/bin/rvm'
|
return '/usr/local/rvm/bin/rvm'
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user