From ceab9628c66b240593fad1da6ba363684f7c1fff Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Tue, 21 Jun 2022 16:50:16 +0000
Subject: Revert "Attempt to fix communication error on images smoke test
(#52)"
This reverts commit 7b256bf53497cf07fc877a99ba790c4eae1b4586.
---
src/ruby/install.sh | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
(limited to 'src')
diff --git a/src/ruby/install.sh b/src/ruby/install.sh
index 1e832bc..4191023 100644
--- a/src/ruby/install.sh
+++ b/src/ruby/install.sh
@@ -12,7 +12,6 @@ RUBY_VERSION=${VERSION:-"latest"}
USERNAME=${USERNAME:-"automatic"}
UPDATE_RC=${UPDATE_RC:-"true"}
INSTALL_RUBY_TOOLS=${INSTALL_RUBY_TOOLS:-"true"}
-RVM_DIR="/usr/local/rvm"
# Note: ruby-debug-ide will install the right version of debase if missing and
# installing debase directly fails on Ruby 3.1.0 as of 1/7/2022, so omitting.
@@ -219,18 +218,13 @@ else
fi
fi
# Create rvm group as a system group to reduce the odds of conflict with local user UIDs
- umask 0002
if ! cat /etc/group | grep -e "^rvm:" > /dev/null 2>&1; then
groupadd -r rvm
fi
# Install rvm
- mkdir -p "${RVM_DIR}"
- usermod -aG rvm ${USERNAME}
- chown -R "${USERNAME}:rvm" "${RVM_DIR}/"
- chmod -R g+r+w "${RVM_DIR}/"
-
curl -sSL https://get.rvm.io | bash -s stable --ignore-dotfiles ${RVM_INSTALL_ARGS} --with-default-gems="${DEFAULT_GEMS}" 2>&1
- source ${RVM_DIR}/scripts/rvm
+ usermod -aG rvm ${USERNAME}
+ source /usr/local/rvm/scripts/rvm
rvm fix-permissions system
rm -rf ${GNUPGHOME}
fi
@@ -281,7 +275,7 @@ if [ "${SKIP_RBENV_RBUILD}" != "true" ]; then
ln -s /usr/local/share/ruby-build /home/${USERNAME}/.rbenv/plugins/ruby-build
fi
- ln -s ${RVM_DIR}/rubies/default/bin/ruby ${RVM_DIR}/gems/default/bin
+ ln -s /usr/local/rvm/rubies/default/bin/ruby /usr/local/rvm/gems/default/bin
chown -R "${USERNAME}:rvm" "/home/${USERNAME}/.rbenv/"
chmod -R g+r+w "/home/${USERNAME}/.rbenv"
@@ -289,7 +283,9 @@ if [ "${SKIP_RBENV_RBUILD}" != "true" ]; then
fi
fi
-find "${RVM_DIR}" -type d | xargs -n 1 chmod g+s
+chown -R "${USERNAME}:rvm" "/usr/local/rvm/"
+chmod -R g+r+w "/usr/local/rvm/"
+find "/usr/local/rvm/" -type d | xargs -n 1 chmod g+s
# Clean up
rvm cleanup all
--
cgit v1.2.3