diff options
| -rw-r--r-- | bin/sisu | 12 | ||||
| -rw-r--r-- | bin/sisu3 | 12 | ||||
| -rw-r--r-- | bin/sisu_termsheet | 12 | ||||
| -rw-r--r-- | bin/sisu_webrick | 12 | ||||
| -rw-r--r-- | data/doc/sisu/CHANGELOG_v2 | 2 | ||||
| -rw-r--r-- | data/doc/sisu/CHANGELOG_v3 | 2 | ||||
| -rw-r--r-- | data/sisu/v2/v/version.yml | 4 | ||||
| -rw-r--r-- | data/sisu/v3/v/version.yml | 4 |
8 files changed, 30 insertions, 30 deletions
@@ -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 @@ -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 diff --git a/data/doc/sisu/CHANGELOG_v2 b/data/doc/sisu/CHANGELOG_v2 index 536dffb7..bc8bbe36 100644 --- a/data/doc/sisu/CHANGELOG_v2 +++ b/data/doc/sisu/CHANGELOG_v2 @@ -12,7 +12,7 @@ Reverse Chronological: %% STABLE Branch -%% 2.9.3.orig.tar.gz (2011-04-26:17/2) [see 3.0.8] +%% 2.9.3.orig.tar.gz (2011-04-27:17/3) [see 3.0.8] http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.8-1 * bin/sisu3 bin/sisu /bin/sisu_webrick bin/sisu_termsheet diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3 index 6fcda98a..68d5fa48 100644 --- a/data/doc/sisu/CHANGELOG_v3 +++ b/data/doc/sisu/CHANGELOG_v3 @@ -13,7 +13,7 @@ Reverse Chronological: %% Development branch UNSTABLE v3 branch once stable will supersede & replace current stable v2 branch -%% 3.0.8.orig.tar.gz (2011-04-26:17/2) +%% 3.0.8.orig.tar.gz (2011-04-27:17/3) http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/3.0.8-1 http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.8.orig.tar.gz sisu_3.0.8.orig.tar.gz diff --git a/data/sisu/v2/v/version.yml b/data/sisu/v2/v/version.yml index 90e93138..9a5dd08a 100644 --- a/data/sisu/v2/v/version.yml +++ b/data/sisu/v2/v/version.yml @@ -1,5 +1,5 @@ --- :version: 2.9.3 -:date_stamp: 2011w17/2 -:date: "2011-04-26" +:date_stamp: 2011w17/3 +:date: "2011-04-27" :project: SiSU diff --git a/data/sisu/v3/v/version.yml b/data/sisu/v3/v/version.yml index 4ad32970..2689e51a 100644 --- a/data/sisu/v3/v/version.yml +++ b/data/sisu/v3/v/version.yml @@ -1,5 +1,5 @@ --- :version: 3.0.8-beta-rb1.9.2p180 -:date_stamp: 2011w17/2 -:date: "2011-04-26" +:date_stamp: 2011w17/3 +:date: "2011-04-27" :project: SiSU |