From b4694609f708d52b7dbd88dfab53f3178451ad27 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Wed, 29 Aug 2012 21:30:02 -0400 Subject: v3: bin/sisu, hub, reorganize call --- bin/sisu2 | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'bin/sisu2') diff --git a/bin/sisu2 b/bin/sisu2 index 4a329e5c..d8aac3dd 100644 --- a/bin/sisu2 +++ b/bin/sisu2 @@ -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 $! -- cgit v1.2.3