From cb84607d3e95ca720af94218dcb988e266de9ff4 Mon Sep 17 00:00:00 2001 From: Ivan Kuchin Date: Sat, 25 Feb 2017 15:46:06 +0100 Subject: [PATCH] fix ordering for versions with different length patch number (nothing, p72, p375) --- bin/ruby-build | 2 +- test/definitions.bats | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/bin/ruby-build b/bin/ruby-build index b0bc3a84..7691a379 100755 --- a/bin/ruby-build +++ b/bin/ruby-build @@ -1136,7 +1136,7 @@ list_definitions() { } sort_versions() { - sed 'h; s/[+-]/./g; s/.p\([[:digit:]]\)/.z\1/; s/$/.z/; G; s/\n/ /' | \ + sed 'h; s/[+-]/./g; s/.p\([[:digit:]]\)/.z.\1/; s/$/.z/; G; s/\n/ /' | \ LC_ALL=C sort -t. -k 1,1 -k 2,2n -k 3,3n -k 4,4n -k 5,5n | awk '{print $2}' } diff --git a/test/definitions.bats b/test/definitions.bats index 4a179f90..21a2bf44 100644 --- a/test/definitions.bats +++ b/test/definitions.bats @@ -68,7 +68,10 @@ NUM_DEFINITIONS="$(ls "$BATS_TEST_DIRNAME"/../share/ruby-build | wc -l)" @test "sorting Ruby versions" { export RUBY_BUILD_ROOT="$TMP" mkdir -p "${RUBY_BUILD_ROOT}/share/ruby-build" - expected="1.9.3-dev + expected="1.8.7 +1.8.7-p72 +1.8.7-p375 +1.9.3-dev 1.9.3-preview1 1.9.3-rc1 1.9.3-p0