From db3dce5503428e941169b271cf3f94e12bdd320a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Thu, 16 May 2024 16:41:44 +0200 Subject: [PATCH] Drop `rubypick` dependency What we need is to have `/usr/bin/ruby` executable, which might be provided by `rubypick` on Fedora, whereas it might be shipped directly by `ruby` package elsewhere. --- run-basic-rails-application/main.fmf | 2 +- run-basic-rails-application/runtest.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/run-basic-rails-application/main.fmf b/run-basic-rails-application/main.fmf index f5c9ba2..8453253 100644 --- a/run-basic-rails-application/main.fmf +++ b/run-basic-rails-application/main.fmf @@ -8,4 +8,4 @@ require: - gcc - git-core - rubygems -- rubypick +- /usr/bin/ruby diff --git a/run-basic-rails-application/runtest.sh b/run-basic-rails-application/runtest.sh index c6c49af..bdb4c61 100755 --- a/run-basic-rails-application/runtest.sh +++ b/run-basic-rails-application/runtest.sh @@ -29,8 +29,8 @@ # Include Beaker environment . /usr/share/beakerlib/beakerlib.sh -PACKAGES=${PACKAGES:-ruby rubygems rubypick} -REQUIRES=${REQUIRES:-} +PACKAGES=${PACKAGES:-ruby rubygems} +REQUIRES=${REQUIRES:-/usr/bin/ruby} RUBY=${RUBY:-ruby} RAILS=0 bundle=""