aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2013-12-03 20:45:13 -0500
committerRalph Amissah <ralph@amissah.com>2013-12-03 20:45:13 -0500
commit6e0b06a069bc0817dea379abbe26ea8b6f7ea48c (patch)
tree3a6c1645ce6641ca04855e26bc9ef4bad1c9e9c4
parentMerge tag 'sisu_4.2.14' into debian/sid (diff)
debian/bin/sisu sync bin/sisu
-rw-r--r--debian/bin/sisu38
1 files changed, 11 insertions, 27 deletions
diff --git a/debian/bin/sisu b/debian/bin/sisu
index 07aa1fb4..ec3232da 100644
--- a/debian/bin/sisu
+++ b/debian/bin/sisu
@@ -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)