Commit cb84607d authored by Ivan Kuchin's avatar Ivan Kuchin
Browse files

fix ordering for versions with different length patch number (nothing, p72, p375)

parent e35d7a59

bin/ruby-build

+1 −1
Original line number Diff line number Diff line
@@ -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}'

}

test/definitions.bats

+4 −1
Original line number Diff line number Diff line
@@ -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