diff options
Diffstat (limited to 'debian/bin')
| -rw-r--r-- | debian/bin/sisu | 28 |
1 files changed, 11 insertions, 17 deletions
diff --git a/debian/bin/sisu b/debian/bin/sisu index d97c37b0..b14b2dfa 100644 --- a/debian/bin/sisu +++ b/debian/bin/sisu @@ -82,30 +82,24 @@ WOK 'v4' end end -#% $0 +#% $0 File.expand_path($0) e=Config::CONFIG - SiSU_lib="sisu/#{SiSU_version_dir}" - sisu_path_specified_lib_=if $0 =~ /^#{e['bindir']}\/sisu[34]?$/ + SiSU_path_base=if $0 =~ /^#{e['bindir']}\/sisu[34]?$/ nil elsif $0 !~ /^#{e['bindir']}\/sisu[34]?$/ \ - && $0 =~/bin\/sisu[34]?$/ \ - && FileTest.file?($0) - $0.sub(/bin\/sisu[34]?$/,'lib'). - sub(/^lib$/,"#{Dir.pwd}/lib") - elsif $0 !~ /^#{e['bindir']}\/sisu[34]?$/ \ - && $0 =~/^sisu[34]?$/ \ + && File.expand_path($0) =~/bin\/sisu[34]?$/ \ && FileTest.file?($0) - $0.sub(/sisu[34]?$/,'../lib') - #bug, relative path does not work for sisu version information - else - nil - end - SiSU_path_specified_Version_=if sisu_path_specified_lib_ - sisu_path_specified_lib_.sub(/\/lib/, - "/data/sisu/#{SiSU_version_dir}/v/version.yml") + File.expand_path($0).sub(/\/bin\/sisu[34]?$/,'') 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') + : nil + SiSU_path_specified_Version_=SiSU_path_base \ + ? "#{SiSU_path_base}/data/sisu/#{SiSU_version_dir}/v/version.yml" + : nil SiSU_path_lib="#{require_hub_path(sisu_path_specified_lib_)}" #% $* require "#{SiSU_path_lib}/hub" |