Merge tag 'sisu_3.3.3' into debian/sid

3 files changed, 22 insertions, 13 deletions

diff --git a/bin/sisu b/bin/sisu
index 87215ec0..f840f8bb 100644
--- a/bin/sisu
+++ b/bin/sisu
@@ -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_stable_ruby_version?
     'v3'
   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 $!
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 $!
diff --git a/bin/sisu3 b/bin/sisu3
index 87215ec0..f840f8bb 100644
--- a/bin/sisu3
+++ b/bin/sisu3
@@ -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_stable_ruby_version?
     'v3'
   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 $!