diff options
| -rw-r--r-- | data/doc/sisu/CHANGELOG_v3 | 4 | ||||
| -rw-r--r-- | lib/sisu/v3/sysenv.rb | 47 |
2 files changed, 27 insertions, 24 deletions
diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3 index 95e27c46..d86a7fbf 100644 --- a/data/doc/sisu/CHANGELOG_v3 +++ b/data/doc/sisu/CHANGELOG_v3 @@ -24,6 +24,10 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.3.1.orig.tar.xz * v3: texpdf_format, urls in headings break pdf documents, fix (e.g. output generation of document sample gpl.fsf.sst pdf fixed) + * v3: sysenv, rsync put (post to remote site), fix, needs comprehensive check + (broken since version 3 (did not cope with alternative output structures), + start to fix; still broken: rsync get (sisu source); also scp put & get) + * v3: hub, some re-arrangement %% 3.3.0.orig.tar.xz (2012-06-17:24/7) diff --git a/lib/sisu/v3/sysenv.rb b/lib/sisu/v3/sysenv.rb index 1527e634..ee881e43 100644 --- a/lib/sisu/v3/sysenv.rb +++ b/lib/sisu/v3/sysenv.rb @@ -3195,81 +3195,86 @@ WOK # SiSU_Env::SystemCall.new("#{local_src}/#{src_txt}",remote_src,@opt.cmd).rsync delete_extra_files='--delete' # '--delete-after' inp=[] - if (@opt.cmd =~/h/ \ + if (@opt.act[:html][:set]==:on \ || @opt.cmd =~/^-[mqvVM]*R[mqvVM]*$/) \ && FileTest.file?(@f.place_file.html_scroll.dir) inp << @f.output_path.html_seg.rel << @f.place_file.html_scroll.rel end - if (@opt.cmd =~/w/ \ + if (@opt.act[:concordance][:set]==:on \ || @opt.cmd =~/^-[mqvVM]*R[mqvVM]*$/) \ && FileTest.file?(@f.place_file.html_concordance.dir) inp << @f.place_file.html_concordance.rel end - if (@opt.cmd =~/e/ \ + if (@opt.act[:epub][:set]==:on \ || @opt.cmd =~/^-R[mqvVM]*$/) \ && FileTest.file?(@f.place_file.epub.dir) inp << @f.place_file.epub.rel end - if (@opt.cmd =~/o/ \ + if (@opt.act[:odt][:set]==:on \ || @opt.cmd =~/^-[mqvVM]*R[mqvVM]*$/) \ && FileTest.file?(@f.place_file.odt.dir) inp << @f.place_file.odt.rel end - if (@opt.cmd =~/b/ \ + if (@opt.act[:xhtml][:set]==:on \ || @opt.cmd =~/^-[mqvVM]*R[mqvVM]*$/) \ && FileTest.file?(@f.place_file.xhtml.dir) inp << @f.place_file.xhtml.rel end - if (@opt.cmd =~/x/ \ + if (@opt.act[:xml_sax][:set]==:on \ || @opt.cmd =~/^-[mqvVM]*R[mqvVM]*$/) \ && FileTest.file?(@f.place_file.xml_sax.dir) inp << @f.place_file.xml_sax.rel end - if (@opt.cmd =~/X/ \ + if (@opt.act[:xml_dom][:set]==:on \ || @opt.cmd =~/^-[mqvVM]*R[mqvVM]*$/) \ && FileTest.file?(@f.place_file.xml_dom.dir) inp << @f.place_file.xml_dom.rel end - if (@opt.cmd =~/[at]/ \ + if (@opt.act[:txt][:set]==:on \ || @opt.cmd =~/^-[mqvVM]*R[mqvVM]*$/) \ && FileTest.file?(@f.place_file.txt.dir) inp << @f.place_file.txt.rel end - if (@opt.cmd =~/i/ \ + if (@opt.act[:manpage][:set]==:on \ || @opt.cmd =~/^-[mqvVM]*i[mqvVM]*$/) \ && FileTest.file?(@f.place_file.manpage.dir) inp << @f.place_file.manpage.rel end - if (@opt.cmd =~/I/ \ + if (@opt.act[:texinfo][:set]==:on \ || @opt.cmd =~/^-[mqvVM]*I[mqvVM]*$/) \ && FileTest.file?(@f.place_file.info.dir) inp << @f.place_file.info.rel end - if (@opt.cmd =~/N/ \ + if (@opt.act[:hash_digests][:set]==:on \ || @opt.cmd =~/^-[mqvVM]*R[mqvVM]*$/) \ && FileTest.file?(@f.place_file.hash_digest.dir) inp << @f.place_file.hash_digest.rel end - if (@opt.cmd =~/s/ \ + if (@opt.act[:share_source][:set]==:on \ || @opt.cmd =~/^-[mqvVM]*R[mqvVM]*$/) \ && FileTest.file?(@f.place_file.src.dir) inp << @f.place_file.src.rel end - if (@opt.cmd =~/S/ \ + if (@opt.act[:sisupod][:set]==:on \ || @opt.cmd =~/^-[mqvVM]*R[mqvVM]*$/) \ && FileTest.file?(@f.place_file.sisupod.dir) inp << @f.place_file.sisupod.rel end - if (@opt.cmd =~/p/ \ + if (@opt.act[:pdf][:set]==:on \ || @opt.cmd =~/^-[mqvVM]*R[mqvVM]*$/) inp << @f.output_path.pdf.rel + '/' + @opt.fnb + '*' end - if (@opt.cmd =~/Q/ \ + if (@opt.act[:sqlite_discreet][:set]==:on \ + || @opt.cmd =~/^-[mqvVM]*R[mqvVM]*$/) \ + && FileTest.file?(@f.place_file.sqlite_discreet.dir) + inp << @f.place_file.sqlite_discreet.rel + end + if (@opt.act[:qrcode][:set]==:on \ || @opt.cmd =~/^-[mqvVM]*R[mqvVM]*$/) \ && FileTest.file?(@f.place_file.qrcode_md.dir) inp << @f.place_file.qrcode_md.rel << @f.place_file.qrcode_title.rel end - if (@opt.cmd =~/y/ \ + if (@opt.act[:manifest][:set]==:on \ || @opt.cmd =~/^-[mqvVM]*R[mqvVM]*$/) \ && FileTest.file?(@f.place_file.manifest.dir) inp << @f.place_file.manifest.rel @@ -4781,16 +4786,10 @@ WOK end end def ab_src - if output_dir_structure.dump_or_redirect? - "." - elsif output_dir_structure.by_language_code? - "#{@ft}/#{@md.opt.lng}" - else - "#{@ft}" - end + @ft end def ab_pod - "#{@ft}" + @ft end self end |