Commit d536fa7a by Mislav Marohnić

Merge branch 'duplicate-versions'

Closes #646, fixes #641
parents 194e007e ffcb7ed6
...@@ -969,7 +969,7 @@ list_definitions() { ...@@ -969,7 +969,7 @@ list_definitions() {
{ for DEFINITION_DIR in "${RUBY_BUILD_DEFINITIONS[@]}"; do { for DEFINITION_DIR in "${RUBY_BUILD_DEFINITIONS[@]}"; do
[ -d "$DEFINITION_DIR" ] && ls "$DEFINITION_DIR" [ -d "$DEFINITION_DIR" ] && ls "$DEFINITION_DIR"
done done
} | sort_versions } | sort_versions | uniq
} }
sort_versions() { sort_versions() {
......
...@@ -94,3 +94,18 @@ jruby-9000" ...@@ -94,3 +94,18 @@ jruby-9000"
run ruby-build --definitions run ruby-build --definitions
assert_success "$expected" assert_success "$expected"
} }
@test "removing duplicate Ruby versions" {
export RUBY_BUILD_ROOT="$TMP"
export RUBY_BUILD_DEFINITIONS="${RUBY_BUILD_ROOT}/share/ruby-build"
mkdir -p "$RUBY_BUILD_DEFINITIONS"
touch "${RUBY_BUILD_DEFINITIONS}/1.9.3"
touch "${RUBY_BUILD_DEFINITIONS}/2.2.0"
run ruby-build --definitions
assert_success
assert_output <<OUT
1.9.3
2.2.0
OUT
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment