diff options
| -rw-r--r-- | bin/sisu | 38 | ||||
| -rw-r--r-- | data/doc/sisu/CHANGELOG_v4 | 2 | ||||
| -rw-r--r-- | data/doc/sisu/CHANGELOG_v5 | 2 |
3 files changed, 15 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) diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4 index 24909dd4..f01d56cd 100644 --- a/data/doc/sisu/CHANGELOG_v4 +++ b/data/doc/sisu/CHANGELOG_v4 @@ -34,6 +34,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_4.2.14.orig.tar.xz * gemspec adjusted to install only libraries related to a version (v4 or v5) * select sisu version to create, build & install +* bin/sisu, simplify in relation to sisu gem + %% 4.2.13.orig.tar.xz (2013-12-02:48/1) http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.13 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.2.13-1 diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5 index aecfa02a..04eae664 100644 --- a/data/doc/sisu/CHANGELOG_v5 +++ b/data/doc/sisu/CHANGELOG_v5 @@ -34,6 +34,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.1.1.orig.tar.xz * gemspec adjusted to install only libraries related to a version (v4 or v5) * select sisu version to create, build & install +* bin/sisu, simplify in relation to sisu gem + %% 5.1.0.orig.tar.xz (2013-12-02:48/1) http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.1.0 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.1.0-1 |