From 35e3bcae6aac45cdbcc1c7f63bbeb1870c171bff Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Sun, 3 Jun 2012 22:29:09 -0400
Subject: v3: images, copy (system link removed)

---
 lib/sisu/v3/sysenv.rb | 46 +++++++++++++++++-----------------------------
 1 file changed, 17 insertions(+), 29 deletions(-)

(limited to 'lib/sisu/v3/sysenv.rb')

diff --git a/lib/sisu/v3/sysenv.rb b/lib/sisu/v3/sysenv.rb
index f57185fc..b8dd37b0 100644
--- a/lib/sisu/v3/sysenv.rb
+++ b/lib/sisu/v3/sysenv.rb
@@ -3404,28 +3404,6 @@ WOK
       %x{ruby -v}.strip
     end
   end
-  class CreateSystemLink                                                      #revisit problems created 2004w41
-    require 'fileutils'
-      include FileUtils::Verbose
-    def initialize
-      @env=SiSU_Env::InfoEnv.new
-    end
-    def images
-      unless FileTest.directory?("#{@env.path.output}/_sisu")
-        FileUtils::mkdir_p("#{@env.path.output}/_sisu")
-      end
-      unless File.exist?("#{@env.path.output}/_sisu/image_sys") \
-      or File.symlink?("#{@env.path.output}/_sisu/image_sys")
-        File.symlink("../../_sisu/image_sys", "#{@env.path.output}/_sisu/image_sys")
-      end
-    end
-    def man_forms
-      #File.symlink("../../man/form", "#{@env.path.output}/man/form") unless File.symlink?("#{@env.path.output}/man/form")==true
-    end
-    def man_pdf
-      #File.symlink("../../man/form", "#{@env.path.output}/man/pdf") unless File.symlink?("#{@env.path.output}/man/pdf")==true
-    end
-  end
   class InfoFile <InfoEnv                                                  #todo unify with FileOp
     def initialize(fns)
       begin
@@ -5930,29 +5908,39 @@ WOK
     def cp_local_images
       src="#{@pwd}/_sisu/image"
       dest="#{@env.path.webserv}/#{@env.path.stub_pwd}/_sisu/image"
-      cp_images(src,dest)
+      cp_images(src,dest) if FileTest.directory?(src)
     end
     def cp_external_images
       src="#{@env.processing_path.processing}/external_document/image"
       dest="#{@env.path.webserv}/#{@env.path.stub_pwd}/_sisu/image_external"
       if FileTest.directory?(src)
-        cp_images(src,dest)
+        cp_images(src,dest) if FileTest.directory?(src)
       end
     end
     def cp_webserver_images
       src=@env.path.image_source
-      dest="#{@env.path.webserv}/_sisu/image"
-      cp_images(src,dest)
+      dest_arr=[
+        "#{@env.path.webserv}/_sisu/image",
+        "#{@env.path.webserv}/#{@env.path.stub_pwd}/_sisu/image"
+      ]
+      dest_arr.each do |dest|
+        cp_images(src,dest) if FileTest.directory?(src)
+      end
     end
     def cp_webserver_images_local #this should not have been necessary
       src=@env.path.image_source
       dest="#{@env.path.webserv}/#{@env.path.stub_pwd}/_sisu/image"
-      cp_images(src,dest)
+      cp_images(src,dest) if FileTest.directory?(src)
     end
     def cp_base_images #fix images
       src="#{@env.path.share}/image"
-      dest="#{@env.path.webserv}/_sisu/image_sys"
-      cp_images(src,dest)
+      dest_arr=[
+        "#{@env.path.webserv}/_sisu/image_sys",
+        "#{@env.path.webserv}/#{@env.path.stub_pwd}/_sisu/image_sys"
+      ]
+      dest_arr.each do |dest|
+        cp_images(src,dest) if FileTest.directory?(src)
+      end
     end
     def cp_css
       FileUtils::mkdir_p("#{@env.path.output}/#{@env.path.style}") unless FileTest.directory?("#{@env.path.output}/#{@env.path.style}")
-- 
cgit v1.2.3