Skip to content

Commit b0a21cd

Browse files
authored
Merge pull request #2621 from amatsuda/fix-resolve-version-ruby-prefix
Fix definition lookup for ruby-prefixed names like `ruby-dev`
2 parents 84bcde9 + e98dffb commit b0a21cd

2 files changed

Lines changed: 14 additions & 0 deletions

File tree

bin/ruby-build

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1420,6 +1420,10 @@ resolve_version() {
14201420

14211421
# Look for an exact match first.
14221422
for DEFINITION_DIR in "${RUBY_BUILD_DEFINITIONS[@]}"; do
1423+
if [ -f "${DEFINITION_DIR}/$1" ]; then
1424+
echo "$1"
1425+
return 0
1426+
fi
14231427
if [ -f "${DEFINITION_DIR}/${version}" ]; then
14241428
echo "$version"
14251429
return 0

test/definitions.bats

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,16 @@ NUM_DEFINITIONS="$(ls "$BATS_TEST_DIRNAME"/../share/ruby-build | wc -l)"
113113
assert_success "3.2.1"
114114
}
115115

116+
@test "resolve definition by exact match for ruby-prefixed name" {
117+
export RUBY_BUILD_DEFINITIONS="${TMP}/definitions"
118+
mkdir -p "${TMP}/definitions"
119+
120+
touch "${TMP}/definitions/ruby-dev"
121+
122+
run bin/ruby-build --resolve "ruby-dev"
123+
assert_success "ruby-dev"
124+
}
125+
116126
@test "resolve definition with ruby prefix" {
117127
export RUBY_BUILD_DEFINITIONS="${TMP}/definitions"
118128
mkdir -p "${TMP}/definitions"

0 commit comments

Comments
 (0)