diff options
| author | Ralph Amissah <ralph@amissah.com> | 2013-05-11 21:48:58 -0400 | 
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2013-05-11 21:48:58 -0400 | 
| commit | 53bda2c1b7f11011f8fbd2307f631d6b9becc7f3 (patch) | |
| tree | 91e18b88bb4c37d407db2d13c65d2374e7b9d9da | |
| parent | Merge tag 'sisu_4.1.0' into debian/sid (diff) | |
debian/bin/sisu, follow bin/sisu (changes)
| -rw-r--r-- | debian/bin/sisu | 26 | 
1 files changed, 13 insertions, 13 deletions
| diff --git a/debian/bin/sisu b/debian/bin/sisu index 5b17c04a..184c4f1f 100644 --- a/debian/bin/sisu +++ b/debian/bin/sisu @@ -54,29 +54,29 @@ WOK    $KCODE='u' if RUBY_VERSION < '1.9'    argv=$*    SiSU_called_from_directory=Dir.pwd -  if $0 !~/\bsisu[34]$/ +  if $0 !~/\bsisu[45]$/      SiSU_version_dir=case argv.inspect -    when /"(?:--v3)"/ -      check_sisu_stable_ruby_version? -      'v3'      when /"(?:--v4)"/        check_sisu_stable_ruby_version?        'v4' +    when /"(?:--v5)"/ +      check_sisu_stable_ruby_version? +      'v5'      when /"(?:--dev)"/        check_sisu_dev_ruby_version? -      'v4' +      'v5'      else        check_sisu_stable_ruby_version?        'v4'      end    else      SiSU_version_dir=case $0 -    when /\bsisu3$/ -      check_sisu_stable_ruby_version? -      'v3'      when /\bsisu4$/        check_sisu_stable_ruby_version?        'v4' +    when /\bsisu5$/ +      check_sisu_stable_ruby_version? +      'v5'      else        check_sisu_stable_ruby_version?        'v4' @@ -84,18 +84,18 @@ WOK    end  #% $0 File.expand_path($0)    e=Config::CONFIG -  SiSU_path_base=if $0 =~ /^#{e['bindir']}\/sisu[34]?$/ +  SiSU_path_base=if $0 =~ /^#{e['bindir']}\/sisu[45]?$/      nil -  elsif $0 !~ /^#{e['bindir']}\/sisu[34]?$/ \ -  && File.expand_path($0) =~/bin\/sisu[34]?$/ \ +  elsif $0 !~ /^#{e['bindir']}\/sisu[45]?$/ \ +  && File.expand_path($0) =~/bin\/sisu[45]?$/ \    && FileTest.file?($0) -    File.expand_path($0).sub(/\/bin\/sisu[34]?$/,'') +    File.expand_path($0).sub(/\/bin\/sisu[45]?$/,'')    else      nil    end    SiSU_lib="sisu/#{SiSU_version_dir}"    sisu_path_specified_lib_=SiSU_path_base \ -  ? File.expand_path($0).sub(/bin\/sisu[34]?$/,'lib') +  ? File.expand_path($0).sub(/bin\/sisu[45]?$/,'lib')    : nil    SiSU_path_specified_Version_=SiSU_path_base \    ? "#{SiSU_path_base}/data/sisu/#{SiSU_version_dir}/v/version.yml" | 
