From c335ab83de40d48093870d300de52c61bbd68359 Mon Sep 17 00:00:00 2001
From: Tom Schraitle <tomschr@users.noreply.github.com>
Date: Tue, 27 Aug 2024 16:10:43 +0200
Subject: [PATCH] Add /usr/etc/rbenv.d to hooks path (#1587)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The directory /usr/etc is an optional directory and used by
Fedora, RHEL 9, and openSUSE. The purpose of /usr/etc is to store
distribution-provided configuration files that can be overridden
by user-modified files in /etc.

Also used in the sister project pyenv/pyenv#3039

Co-authored-by: Mislav Marohnić <git@mislav.net>
---
 libexec/rbenv   | 2 +-
 test/rbenv.bats | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libexec/rbenv b/libexec/rbenv
index 008cc808..66c79bf8 100755
--- a/libexec/rbenv
+++ b/libexec/rbenv
@@ -82,7 +82,7 @@ if [ ! "${libexec_dir%/*}"/rbenv.d -ef "$RBENV_ROOT"/rbenv.d ]; then
   # Add rbenv's own `rbenv.d` unless rbenv was cloned to RBENV_ROOT
   RBENV_HOOK_PATH="${RBENV_HOOK_PATH}:${libexec_dir%/*}/rbenv.d"
 fi
-RBENV_HOOK_PATH="${RBENV_HOOK_PATH}:/usr/local/etc/rbenv.d:/etc/rbenv.d:/usr/lib/rbenv/hooks"
+RBENV_HOOK_PATH="${RBENV_HOOK_PATH}:/usr/etc/rbenv.d:/usr/local/etc/rbenv.d:/etc/rbenv.d:/usr/lib/rbenv/hooks"
 for plugin_hook in "${RBENV_ROOT}/plugins/"*/etc/rbenv.d; do
   RBENV_HOOK_PATH="${RBENV_HOOK_PATH}:${plugin_hook}"
 done
diff --git a/test/rbenv.bats b/test/rbenv.bats
index 5a6ef011..c8b030fa 100644
--- a/test/rbenv.bats
+++ b/test/rbenv.bats
@@ -64,7 +64,7 @@ load test_helper
 @test "RBENV_HOOK_PATH includes etc/rbenv.d folders" {
   mkdir -p "$RBENV_ROOT"/plugins/rbenv-foo/etc/rbenv.d
   run rbenv echo -F: "RBENV_HOOK_PATH"
-  assert_line 6 "${RBENV_ROOT}/plugins/rbenv-foo/etc/rbenv.d"
+  assert_line 7 "${RBENV_ROOT}/plugins/rbenv-foo/etc/rbenv.d"
 }
 
 @test "RBENV_HOOK_PATH preserves value from environment" {
@@ -78,5 +78,5 @@ load test_helper
 @test "RBENV_HOOK_PATH includes rbenv built-in plugins" {
   unset RBENV_HOOK_PATH
   run rbenv echo "RBENV_HOOK_PATH"
-  assert_success "${RBENV_ROOT}/rbenv.d:${BATS_TEST_DIRNAME%/*}/rbenv.d:/usr/local/etc/rbenv.d:/etc/rbenv.d:/usr/lib/rbenv/hooks"
+  assert_success "${RBENV_ROOT}/rbenv.d:${BATS_TEST_DIRNAME%/*}/rbenv.d:/usr/etc/rbenv.d:/usr/local/etc/rbenv.d:/etc/rbenv.d:/usr/lib/rbenv/hooks"
 }