v3: sysenv, output_path & place_file, modified, (affects many libraries)

* paths for dir, url, relative and rcp that vary with output dir structure
* cope with alterative dir structures
  * manifest url paths, fix
  * dal_expand_insertions, fix
  * rsync, review
* scp disabled

1 files changed, 6 insertions, 6 deletions

diff --git a/lib/sisu/v3/sisupod_make.rb b/lib/sisu/v3/sisupod_make.rb
index 21255bb7..f54f43d9 100644
--- a/lib/sisu/v3/sisupod_make.rb
+++ b/lib/sisu/v3/sisupod_make.rb
@@ -77,7 +77,7 @@ module SiSU_Doc
       end
       @particulars=SiSU_Particulars::Combined_singleton.instance.get_all(opt)
       @file=@particulars.file
-      @local_path="#{@file.output_path.sisupod}" #@local_path="#{@env.path.output}/#{@env.fnb}"
+      @local_path="#{@file.output_path.sisupod.dir}" #@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
@@ -92,7 +92,7 @@ module SiSU_Doc
       end
       unless @opt.fns.empty?
         unless @opt.cmd =~/q/
-          SiSU_Screen::Ansi.new(@opt.cmd,'Make sisu document (zip) and place in output directory',"#{@opt.fns} -> file://#{@file.output_path.sisupod}/#{@zipfile}.zip").warn if @opt.cmd =~/[MVv]/
+          SiSU_Screen::Ansi.new(@opt.cmd,'Make sisu document (zip) and place in output directory',"#{@opt.fns} -> file://#{@file.output_path.sisupod.dir}/#{@zipfile}.zip").warn if @opt.cmd =~/[MVv]/
         end
         directories
         sisupod_build
@@ -266,7 +266,7 @@ module SiSU_Doc
       end #NB not all possibilies met, revisit, also in case of composite file may wish to add README
     end
     def sisupod_7zip #look at later
-      mkdir_p(@file.output_path.sisupod) unless FileTest.directory?(@file.output_path.sisupod)
+      mkdir_p(@file.output_path.sisupod.dir) unless FileTest.directory?(@file.output_path.sisupod.dir)
       system(%{
         cd #{@env.processing_path.processing}
         echo "SiSU sisupod #{@ver[:version]}" > sisu_zip.txt
@@ -274,19 +274,19 @@ module SiSU_Doc
         7zr a -t7z -m0=lzma -mx=9 -ms=on #{@zipfile}.7z sisu_zip.txt
         7zr a -t7z -m0=lzma -mx=9 -ms=on #{@zipfile}.7z sisupod
         #7zip -qr #{@zipfile}.7z sisupod
-        mv #{@zipfile}.7z #{@file.place_file.sisupod} &
+        mv #{@zipfile}.7z #{@file.place_file.sisupod.dir} &
         rm -r sisupod/* && cd #{@env.path.pwd}
       })
       SiSU_Screen::Ansi.new('',"#{@opt.fns}.7z").blue_tab unless @opt.cmd =~/q/
     end
     def sisupod_zip
-      mkdir_p(@file.output_path.sisupod) unless FileTest.directory?(@file.output_path.sisupod)
+      mkdir_p(@file.output_path.sisupod.dir) unless FileTest.directory?(@file.output_path.sisupod.dir)
       system(%{
         cd #{@env.processing_path.processing}
         echo "SiSU sisupod #{@ver[:version]}" > sisu_zip.txt
         zip -qz #{@zipfile}.zip sisu_zip.txt < sisu_zip.txt
         zip -qr #{@zipfile}.zip sisupod
-        mv #{@zipfile}.zip #{@file.place_file.sisupod} &
+        mv #{@zipfile}.zip #{@file.place_file.sisupod.dir} &
         rm -r sisupod/* && cd #{@env.path.pwd}
       })
       SiSU_Screen::Ansi.new('',"#{@zipfile}.zip").blue_tab if @opt.cmd =~/[MVv]/