From 36aaaacb0edb8c88f973fd9c43e08b88c24efc93 Mon Sep 17 00:00:00 2001 From: Samruddhi Khandale Date: Mon, 26 Sep 2022 16:57:53 +0000 Subject: [PATCH 1/3] fix rbenv bug --- src/ruby/devcontainer-feature.json | 2 +- src/ruby/install.sh | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/ruby/devcontainer-feature.json b/src/ruby/devcontainer-feature.json index 3cccec362..f1cebfb17 100644 --- a/src/ruby/devcontainer-feature.json +++ b/src/ruby/devcontainer-feature.json @@ -29,6 +29,6 @@ "GEM_PATH": "/usr/local/rvm/gems/default:/usr/local/rvm/gems/default@global", "GEM_HOME": "/usr/local/rvm/gems/default", "MY_RUBY_HOME": "/usr/local/rvm/rubies/default", - "PATH": "/usr/local/rvm/gems/default/bin:/usr/local/rvm/gems/default@global/bin:/usr/local/rvm/rubies/default/bin:${PATH}" + "PATH": "/usr/local/rvm/gems/default/bin:/usr/local/rvm/gems/default@global/bin:/usr/local/rvm/rubies/default/bin:/usr/local/share/rbenv/bin:${PATH}" } } \ No newline at end of file diff --git a/src/ruby/install.sh b/src/ruby/install.sh index 62a096bb4..6ff3b2f87 100755 --- a/src/ruby/install.sh +++ b/src/ruby/install.sh @@ -263,9 +263,6 @@ if [ "${SKIP_RBENV_RBUILD}" != "true" ]; then -c fetch.fsck.zeroPaddedFilemode=ignore \ -c receive.fsck.zeroPaddedFilemode=ignore \ https://github.com/rbenv/rbenv.git /usr/local/share/rbenv - - ln -s /usr/local/share/rbenv/bin/rbenv /usr/local/bin - updaterc 'eval "$(rbenv init -)"' fi if [[ ! -d "/usr/local/share/ruby-build" ]]; then From 9e366588539e27443f64eafc9253e30728741fec Mon Sep 17 00:00:00 2001 From: Samruddhi Khandale Date: Mon, 26 Sep 2022 16:59:42 +0000 Subject: [PATCH 2/3] bump version --- src/ruby/devcontainer-feature.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ruby/devcontainer-feature.json b/src/ruby/devcontainer-feature.json index f1cebfb17..9e617d0d4 100644 --- a/src/ruby/devcontainer-feature.json +++ b/src/ruby/devcontainer-feature.json @@ -1,6 +1,6 @@ { "id": "ruby", - "version": "1.0.3", + "version": "1.0.4", "name": "Ruby (via rvm)", "documentationURL": "https://github.com/devcontainers/features/tree/main/src/ruby", "description": "Installs Ruby, rvm, rbenv, common Ruby utilities, and needed dependencies.", From 5d215504078fea095b628c6f1e57a47eadb276df Mon Sep 17 00:00:00 2001 From: Samruddhi Khandale Date: Mon, 26 Sep 2022 17:04:25 +0000 Subject: [PATCH 3/3] adds test --- test/ruby/install_additional_ruby.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/ruby/install_additional_ruby.sh b/test/ruby/install_additional_ruby.sh index 3e761597d..e5a651c5b 100644 --- a/test/ruby/install_additional_ruby.sh +++ b/test/ruby/install_additional_ruby.sh @@ -9,5 +9,7 @@ check "ruby version 3.1.2 installed as default" ruby -v | grep 3.1.2 check "ruby version 2.5.9 installed" rvm list | grep 2.5.9 check "ruby version 3.0.4 installed" rvm list | grep 3.0.4 +check "rbenv" bash -c 'eval "$(rbenv init -)" && rbenv --version' + # Report result reportResults