summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Macfarlane <smacfarlane@chef.io>2019-05-15 07:40:07 -0700
committerScott Macfarlane <smacfarlane@chef.io>2019-05-15 07:40:07 -0700
commit6177e69bc01348f0ddd94d6c8e2c9e53c8152bbe (patch)
treec1830dad5e0168c7c1ac278087afc2cb16eb5c43
parentcdcbe629ef44b8206e74db00148b04803a333892 (diff)
downloadchef-6177e69bc01348f0ddd94d6c8e2c9e53c8152bbe.tar.gz
Use core/ruby26
Signed-off-by: Scott Macfarlane <smacfarlane@chef.io>
-rw-r--r--habitat/plan.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/habitat/plan.sh b/habitat/plan.sh
index 26fcd5dad6..b7704d6976 100644
--- a/habitat/plan.sh
+++ b/habitat/plan.sh
@@ -7,7 +7,7 @@ pkg_license=('Apache-2.0')
pkg_filename=${pkg_dirname}.tar.gz
pkg_bin_dirs=(bin)
pkg_build_deps=(core/make core/gcc core/git)
-pkg_deps=(core/glibc core/ruby core/libxml2 core/libxslt core/libiconv core/xz core/zlib core/bundler core/openssl core/cacerts core/libffi core/coreutils core/libarchive)
+pkg_deps=(core/glibc core/ruby26 core/libxml2 core/libxslt core/libiconv core/xz core/zlib core/bundler core/openssl core/cacerts core/libffi core/coreutils core/libarchive)
pkg_svc_user=root
do_before() {
@@ -80,7 +80,7 @@ do_install() {
popd > /dev/null
fix_interpreter "${pkg_prefix}/bin/*" core/coreutils bin/env
- fix_interpreter "${pkg_prefix}/bin/*" core/ruby bin/ruby
+ fix_interpreter "${pkg_prefix}/bin/*" core/ruby26 bin/ruby
}
do_end() {
@@ -104,7 +104,7 @@ _bundle_install() {
--jobs "$(nproc)" \
--without development:test \
--path "$path" \
- --shebang="$(pkg_path_for "core/ruby")/bin/ruby" \
+ --shebang="$(pkg_path_for "core/ruby26")/bin/ruby" \
--no-clean \
--retry 5 \
--standalone