From 82df249c14d07d5cf0b81148ca017356834fbdc5 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Fri, 10 Jun 2022 18:21:27 +0000
Subject: [PATCH 1/2] ruby: fix permissions and ln for oryx

---
 src/ruby/install.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/ruby/install.sh b/src/ruby/install.sh
index f4c7b10bd..7bbec15b2 100644
--- a/src/ruby/install.sh
+++ b/src/ruby/install.sh
@@ -272,10 +272,14 @@ if [ "${SKIP_RBENV_RBUILD}" != "true" ]; then
     if [ "${USERNAME}" != "root" ]; then
         mkdir -p /home/${USERNAME}/.rbenv/plugins
         chown -R ${USERNAME} /home/${USERNAME}/.rbenv
+        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
 

From e7f3e234cb4fa3d16c8db5048ff9c00fe42d887d Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Fri, 10 Jun 2022 18:27:43 +0000
Subject: [PATCH 2/2] add sudo_if

---
 src/ruby/install.sh | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/ruby/install.sh b/src/ruby/install.sh
index 7bbec15b2..5152893ab 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,8 +279,8 @@ if [ "${SKIP_RBENV_RBUILD}" != "true" ]; then
 
     if [ "${USERNAME}" != "root" ]; then
         mkdir -p /home/${USERNAME}/.rbenv/plugins
-        chown -R ${USERNAME} /home/${USERNAME}/.rbenv
-        chown -R ${USERNAME} /usr/local/rvm/
+        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