From 03073b714c0d0821003b0491b4a19c1a67d3a98d Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Wed, 27 Apr 2011 20:32:05 -0400 Subject: v2 v3: bin/ type fix for ruby version check --- bin/sisu | 12 ++++++------ bin/sisu3 | 12 ++++++------ bin/sisu_termsheet | 12 ++++++------ bin/sisu_webrick | 12 ++++++------ 4 files changed, 24 insertions(+), 24 deletions(-) (limited to 'bin') diff --git a/bin/sisu b/bin/sisu index 5f60f8d7..0fde8a55 100644 --- a/bin/sisu +++ b/bin/sisu @@ -5,12 +5,12 @@ begin def ruby_version_ok?(base_version) @v ||=RUBY_VERSION.scan(/\d+/) vb=base_version.scan(/\d+/) - if @v[0] < vb[0] \ - or @v[0] == vb[0] \ - && @v[1] < vb[1] \ - or @v[0] == vb[0] \ - && @v[1] == vb[1] \ - && @v[1] < vb[2] + if @v[0].to_i < vb[0].to_i \ + or @v[0].to_i == vb[0].to_i \ + && @v[1].to_i < vb[1].to_i \ + or @v[0].to_i == vb[0].to_i \ + && @v[1].to_i == vb[1].to_i \ + && @v[1].to_i < vb[2].to_i raise "Please, use Ruby#{vb} or later, current Ruby #{RUBY_VERSION}" else check_incompatible_ruby_build? end diff --git a/bin/sisu3 b/bin/sisu3 index 31664a70..e02f2588 100644 --- a/bin/sisu3 +++ b/bin/sisu3 @@ -5,12 +5,12 @@ begin def ruby_version_ok?(base_version) @v ||=RUBY_VERSION.scan(/\d+/) vb=base_version.scan(/\d+/) - if @v[0] < vb[0] \ - or @v[0] == vb[0] \ - && @v[1] < vb[1] \ - or @v[0] == vb[0] \ - && @v[1] == vb[1] \ - && @v[1] < vb[2] + if @v[0].to_i < vb[0].to_i \ + or @v[0].to_i == vb[0].to_i \ + && @v[1].to_i < vb[1].to_i \ + or @v[0].to_i == vb[0].to_i \ + && @v[1].to_i == vb[1].to_i \ + && @v[1].to_i < vb[2].to_i raise "Please, use Ruby#{vb} or later, current Ruby #{RUBY_VERSION}" else check_incompatible_ruby_build? end diff --git a/bin/sisu_termsheet b/bin/sisu_termsheet index 28ac0277..2e344728 100644 --- a/bin/sisu_termsheet +++ b/bin/sisu_termsheet @@ -5,12 +5,12 @@ begin def ruby_version_ok?(base_version) @v ||=RUBY_VERSION.scan(/\d+/) vb=base_version.scan(/\d+/) - if @v[0] < vb[0] \ - or @v[0] == vb[0] \ - && @v[1] < vb[1] \ - or @v[0] == vb[0] \ - && @v[1] == vb[1] \ - && @v[1] < vb[2] + if @v[0].to_i < vb[0].to_i \ + or @v[0].to_i == vb[0].to_i \ + && @v[1].to_i < vb[1].to_i \ + or @v[0].to_i == vb[0].to_i \ + && @v[1].to_i == vb[1].to_i \ + && @v[1].to_i < vb[2].to_i raise "Please, use Ruby#{vb} or later, current Ruby #{RUBY_VERSION}" else check_incompatible_ruby_build? end diff --git a/bin/sisu_webrick b/bin/sisu_webrick index 4abcaff4..ca678acd 100644 --- a/bin/sisu_webrick +++ b/bin/sisu_webrick @@ -5,12 +5,12 @@ begin def ruby_version_ok?(base_version) @v ||=RUBY_VERSION.scan(/\d+/) vb=base_version.scan(/\d+/) - if @v[0] < vb[0] \ - or @v[0] == vb[0] \ - && @v[1] < vb[1] \ - or @v[0] == vb[0] \ - && @v[1] == vb[1] \ - && @v[1] < vb[2] + if @v[0].to_i < vb[0].to_i \ + or @v[0].to_i == vb[0].to_i \ + && @v[1].to_i < vb[1].to_i \ + or @v[0].to_i == vb[0].to_i \ + && @v[1].to_i == vb[1].to_i \ + && @v[1].to_i < vb[2].to_i raise "Please, use Ruby#{vb} or later, current Ruby #{RUBY_VERSION}" else check_incompatible_ruby_build? end -- cgit v1.2.3