diff options
author | Ralph Amissah <ralph@amissah.com> | 2013-12-03 20:42:50 -0500 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2013-12-03 20:42:50 -0500 |
commit | 676eba5360a6e6e07e4fc5dc79d2e2f076ea581c (patch) | |
tree | 963cd5a8d8d7e947888d46840dd0c9f407baa0e0 /bin | |
parent | v4 v5: rake create build & install sisu gemspec; (.gitignore), work on (diff) |
v4 v5: bin/sisu, simplify in relation to sisu gemsisu_4.2.14
Diffstat (limited to 'bin')
-rw-r--r-- | bin/sisu | 38 |
1 files changed, 11 insertions, 27 deletions
@@ -56,34 +56,18 @@ WOK SiSU_called_from_directory=Dir.pwd require 'rubygems' check_sisu_stable_ruby_version? - if __FILE__ =~/gem/ \ - and __FILE__ =~/sisu-[45]\.\d+\.\d+/ - SiSU_version_dir=(__FILE__ =~/sisu-5\.\d+\.\d+/) \ - ? 'v5' - : 'v4' - elsif $0 !~/\b(?:sisu[45]|sisugem)$/ - SiSU_version_dir=case argv.inspect - when /"(?:--v4)"/ - 'v4' - when /"(?:--v5)"/ - 'v5' - when /"--dev"/ - 'v5' - else - 'v4' - end + default_version=if __FILE__ =~/gem/ \ + and __FILE__ =~/\/sisu-[45]\.(?:\d+|[a-z])\.(?:\d+|[a-z])\// + SiSU_version_dir=(__FILE__ =~/\/sisu-5\.(?:\d+|[a-z])\.(?:\d+|[a-z])\//) ? 'v5' : 'v4' + else 'v4' + end + if $0 =~/\bsisu4$/ then 'v4' + elsif $0 =~/\bsisu5$/ then 'v5' else - SiSU_version_dir=case $0 - when /\bsisu4$/ - 'v4' - when /\bsisu5$/ - 'v5' - when /sisugem$/ # should have been caught earlier, unused, debug check - SiSU_version_dir=(__FILE__ =~/sisu-5\.\d+\.\d+/) \ - ? 'v5' - : 'v4' - else - 'v4' + SiSU_version_dir=case argv.inspect + when /"(?:--v4|--current|--stable)"/ then 'v4' + when /"(?:--v5|--next|--dev)"/ then 'v5' + else default_version end end #% $0 File.expand_path($0) |