From a71a223511b29a41cfefea61e577e7255d46e207 Mon Sep 17 00:00:00 2001 From: Samruddhi Khandale Date: Fri, 10 Jun 2022 11:37:11 -0700 Subject: [PATCH] ruby: fix permissions and ln for oryx (#43) * ruby: fix permissions and ln for oryx * add sudo_if --- src/ruby/install.sh | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/ruby/install.sh b/src/ruby/install.sh index f4c7b10..5152893 100644 --- a/src/ruby/install.sh +++ b/src/ruby/install.sh @@ -167,6 +167,14 @@ check_packages() { fi } +sudo_if() { + COMMAND="$*" + if [ "$(id -u)" -eq 0 ] && [ "$USERNAME" != "root" ]; then + su - "$USERNAME" -c "$COMMAND" + else + "$COMMAND" + fi +} # Ensure apt is in non-interactive to avoid prompts export DEBIAN_FRONTEND=noninteractive @@ -271,11 +279,15 @@ if [ "${SKIP_RBENV_RBUILD}" != "true" ]; then if [ "${USERNAME}" != "root" ]; then mkdir -p /home/${USERNAME}/.rbenv/plugins - chown -R ${USERNAME} /home/${USERNAME}/.rbenv + sudo_if chown -R ${USERNAME} /home/${USERNAME}/.rbenv + sudo_if chown -R ${USERNAME} /usr/local/rvm/ if [[ ! -d "/home/${USERNAME}/.rbenv/plugins/ruby-build" ]]; then ln -s /usr/local/share/ruby-build /home/${USERNAME}/.rbenv/plugins/ruby-build fi + + ln -s /usr/local/rvm/rubies/default/bin/ruby /usr/local/rvm/gems/default/bin + fi fi