default image directories moved, more convenient/logical [test]

1 files changed, 10 insertions, 10 deletions

diff --git a/lib/sisu/v0/sysenv.rb b/lib/sisu/v0/sysenv.rb
index 1c684052..4252529d 100644
--- a/lib/sisu/v0/sysenv.rb
+++ b/lib/sisu/v0/sysenv.rb
@@ -1543,11 +1543,11 @@ WOK
             require 'ftools'
             images=Dir.glob("#{defaults[:image_local]}/*.{png,jpg,gif}")
             pth="#{path.webserv}/#@stub_pwd"
-            File.mkpath("#{pth}/_sisu/image_local") unless FileTest.directory?("#{pth}/_sisu/image_local")
+            File.mkpath("#{pth}/_sisu/image") unless FileTest.directory?("#{pth}/_sisu/image")
             images.each { |i| File.install(i,"#{pth}/#{i}") } unless images.length > 0
             @@image_flag=false
           end
-          '../_sisu/image_local'
+          '../_sisu/image'
         else
           if @@local_image==true
             cmd=if @cmd; @cmd
@@ -2112,14 +2112,14 @@ WOK
       remote="#{remote_host_base}/#{@env.path.stub_pwd}/."
       if defined? @rc['permission_set']['remote_base_site'] and @rc['permission_set']['remote_base_site'] and @@flag_remote==true and @opt.cmd !~/U/
         puts "begin scp_base_all: #{local} -> #{remote}"
+        System_call.new("#{local}/_sisu/image_sys/",remote).scp
         System_call.new("#{local}/_sisu/image/",remote).scp
-        System_call.new("#{local}/_sisu/image_local/",remote).scp
         System_call.new("#{local}/#{@env.path.style}/",remote).scp
       elsif @opt.cmd =~/U/
         puts "#{__FILE__} #{__LINE__}" if @opt.cmd =~/M/
         puts "scp_base_all: #{local} -> #{remote}"
+        puts "#{local}/_sisu/image_sys/ -> #{remote}"
         puts "#{local}/_sisu/image/ -> #{remote}"
-        puts "#{local}/_sisu/image_local/ -> #{remote}"
         puts "#{local}/#{@env.path.style}/ -> #{remote}"
       else  puts "permission not granted #{__FILE__} #{__LINE__}" if @opt.cmd =~/M/
       end
@@ -2135,8 +2135,8 @@ WOK
       elsif @opt.cmd =~/U/
         puts "#{__FILE__} #{__LINE__}" if @opt.cmd =~/M/
         puts "rsync_base: #{local} -> #{remote}"
+        puts "#{local}/_sisu/image_sys/ -> #{remote}"
         puts "#{local}/_sisu/image/ -> #{remote}"
-        puts "#{local}/_sisu/image_local/ -> #{remote}"
         puts "#{local}/#{@env.path.style}/ -> #{remote}"
       else  puts "permission not granted #{__FILE__} #{__LINE__}" if @opt.cmd =~/M/
       end
@@ -2146,14 +2146,14 @@ WOK
       remote="#{remote_host_base}/#{@env.path.stub_pwd}/."
       if defined? @rc['permission_set']['remote_base_site'] and @rc['permission_set']['remote_base_site'] and @@flag_remote==true and @opt.cmd !~/U/
         puts "begin rsync_base_sync: #{local} -> #{remote}"
+        System_call.new("#{local}/_sisu/image_sys/",remote).rsync('--delete-after')
         System_call.new("#{local}/_sisu/image/",remote).rsync('--delete-after')
-        System_call.new("#{local}/_sisu/image_local/",remote).rsync('--delete-after')
         System_call.new("#{local}/#{@env.path.style}/",remote).rsync('--delete-after')
       elsif @opt.cmd =~/U/
         puts "#{__FILE__} #{__LINE__}" if @opt.cmd =~/M/
         puts "rsync_base_sync: #{local} -> #{remote}"
+        puts "#{local}/_sisu/image_sys/ -> #{remote}"
         puts "#{local}/_sisu/image/ -> #{remote}"
-        puts "#{local}/_sisu/image_local/ -> #{remote}"
         puts "#{local}/#{@env.path.style}/ -> #{remote}"
       else  puts "permission not granted #{__FILE__} #{__LINE__}" if @opt.cmd =~/M/
       end
@@ -2194,7 +2194,7 @@ WOK
     end
     def images
       File.mkpath("#{@env.path.output}/_sisu") unless FileTest.directory?("#{@env.path.output}/_sisu")
-      File.symlink("../../_sisu/image", "#{@env.path.output}/_sisu/image") unless File.exist?("#{@env.path.output}/_sisu/image") or File.symlink?("#{@env.path.output}/_sisu/image")
+      File.symlink("../../_sisu/image_sys", "#{@env.path.output}/_sisu/image_sys") unless File.exist?("#{@env.path.output}/_sisu/image_sys") or File.symlink?("#{@env.path.output}/_sisu/image_sys")
     end
     def man_forms
       #File.symlink("../../man/form", "#{@env.path.output}/man/form") unless File.symlink?("#{@env.path.output}/man/form") == true
@@ -2633,7 +2633,7 @@ WOK
     end
     def cp_local_images
       src="#@pwd/_sisu/image"
-      dest="#{@env.path.webserv}/#{@env.path.stub_pwd}/_sisu/image_local"
+      dest="#{@env.path.webserv}/#{@env.path.stub_pwd}/_sisu/image"
       cp_images(src,dest)
     end
     def cp_external_images
@@ -2648,7 +2648,7 @@ WOK
     end
     def cp_base_images #fix images
       src="#{@env.path.share}/image"
-      dest="#{@env.path.webserv}/_sisu/image"
+      dest="#{@env.path.webserv}/_sisu/image_sys"
       cp_images(src,dest)
     end
     def cp_css