diff options
author | Ralph Amissah <ralph@amissah.com> | 2012-08-29 21:30:02 -0400 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2012-08-29 21:30:02 -0400 |
commit | b4694609f708d52b7dbd88dfab53f3178451ad27 (patch) | |
tree | fb066d979178187c5c9273b6a9ffa80722766e43 /bin | |
parent | v3: sisu -v, provide version information, fix (diff) |
v3: bin/sisu, hub, reorganize call
Diffstat (limited to 'bin')
-rw-r--r-- | bin/sisu | 11 | ||||
-rw-r--r-- | bin/sisu2 | 13 | ||||
-rw-r--r-- | bin/sisu3 | 11 |
3 files changed, 22 insertions, 13 deletions
@@ -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 $! @@ -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 $! @@ -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 $! |