diff options
| author | Ralph Amissah <ralph@amissah.com> | 2012-12-12 14:58:58 -0500 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2012-12-12 14:58:58 -0500 |
| commit | 1beb5aa3c376dbef89bc33024216650529ef7262 (patch) | |
| tree | 1682500089c14fd49bcf52a3a001e291fadd5f75 /bin/sisu2 | |
| parent | debian/changelog (3.3.2-1) (diff) | |
| parent | v3: 3.3.3 version & changelog, dates touched (diff) | |
Merge tag 'sisu_3.3.3' into debian/sid
Diffstat (limited to 'bin/sisu2')
| -rw-r--r-- | bin/sisu2 | 13 |
1 files changed, 8 insertions, 5 deletions
@@ -1,6 +1,6 @@ #!/usr/bin/env ruby # encoding: utf-8 -#SiSU: copyright (C) 1997 - 2011 Ralph Amissah; License GPL, see appended program information +#SiSU: copyright (C) 1997 - 2012 Ralph Amissah; License GPL, see appended program information begin def ruby_version_ok?(base_version) @v ||=RUBY_VERSION.scan(/\d+/) @@ -45,21 +45,24 @@ WOK $KCODE='u' if RUBY_VERSION < '1.9' argv=$* SiSU_version_dir=case argv.inspect - when /--v2/ + when /"(?:--v2)"/ check_sisu_legacy_ruby_version? 'v2' - when /--v3/ + when /"(?:--v3)"/ check_sisu_stable_ruby_version? 'v3' - when /--dev/ + when /"(?:--dev)"/ check_sisu_dev_ruby_version? - 'v3' #'v3dv' + 'v3' else check_sisu_legacy_ruby_version? 'v2' end SiSU_lib="sisu/#{SiSU_version_dir}" require "#{SiSU_lib}/hub" + unless SiSU_version_dir == 'v2' + SiSU::HubMaster.new(argv) + end rescue STDERR.puts 'ERROR' STDERR.puts $! |