diff options
author | Ralph Amissah <ralph@amissah.com> | 2007-10-19 20:29:36 +0100 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2007-10-19 20:29:36 +0100 |
commit | 70a56ab6c2c6bcc668f5c4f3667361f7d72d1809 (patch) | |
tree | aa4b2229fdf2b9078d3f939372447c9892fcbc47 /lib/sisu/v0/sisupod_make.rb | |
parent | Merge branch 'upstream' into debian/sid (diff) | |
parent | mostly paths for shared markup source (txt and pod), also... (diff) |
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'lib/sisu/v0/sisupod_make.rb')
-rw-r--r-- | lib/sisu/v0/sisupod_make.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/sisu/v0/sisupod_make.rb b/lib/sisu/v0/sisupod_make.rb index af60cf4e..81645883 100644 --- a/lib/sisu/v0/sisupod_make.rb +++ b/lib/sisu/v0/sisupod_make.rb @@ -63,7 +63,7 @@ module SiSU_Doc require "#{SiSU_lib}/response" def initialize(opt) @opt=opt - m=/.+\/(\S+)/m + m=/.+\/(?:src\/)?(\S+)/im # m=/.+?\/(?:src\/)?([^\/]+)$/im # m=/.+\/(\S+)/m @date=SiSU_Env::Info_date.new.dt @env=SiSU_Env::Info_env.new(@opt.fns) @ver=SiSU_Env::Info_version.new.get_version @@ -72,7 +72,7 @@ module SiSU_Doc @v=if @opt.cmd =~/[VM]/; 'v' else '' end - @local_path="#{@env.path.output}/src" #@local_path="#{@env.path.output}/#{@env.fnb}" + @local_path="#{@env.path.output_pod}" #@local_path="#{@env.path.output}/#{@env.fnb}" @zipfile=if @opt.fns =~/\.ssm\.sst$/; @opt.fns.gsub(/(?:\~\S{2,3})?\.ssm\.sst$/,'.ssm') else @opt.fns.gsub(/(?:\~\S{2,3})?(\.sst)$/,'\1') end @@ -83,7 +83,7 @@ module SiSU_Doc tell=SiSU_Screen::Ansi.new(@opt.cmd,'Share SiSU Document (zip)',@opt.fns) tell.green_hi_blue unless @opt.cmd =~/q/ unless @opt.fns.empty? - tell=SiSU_Screen::Ansi.new(@opt.cmd,'Make sisu document (zip) and place in output directory',"#{@opt.fns} -> file://#{@env.path.output}/src/#{@zipfile}.zip") + tell=SiSU_Screen::Ansi.new(@opt.cmd,'Make sisu document (zip) and place in output directory',"#{@opt.fns} -> file://#{@env.path.output_pod}/#{@zipfile}.zip") tell.warn unless @opt.cmd =~/q/ directories sisupod_build |