aboutsummaryrefslogtreecommitdiffhomepage
path: root/lib
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2007-11-03 00:48:55 +0000
committerRalph Amissah <ralph@amissah.com>2007-11-03 00:48:55 +0000
commit0c44ce25b4435f687e777dc607a415e37d9d528f (patch)
tree1ddd824795655c7d617a07a0614cceec2c3ba9c0 /lib
parentMerge branch 'upstream' into debian/sid (diff)
parentremote markup source, image download; vim ftplugin sisu.vim status line; vim ... (diff)
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'lib')
-rw-r--r--lib/sisu/v0/composite.rb3
-rw-r--r--lib/sisu/v0/embedded.rb8
-rw-r--r--lib/sisu/v0/sysenv.rb6
3 files changed, 13 insertions, 4 deletions
diff --git a/lib/sisu/v0/composite.rb b/lib/sisu/v0/composite.rb
index 3e4e7d0d..a5dac682 100644
--- a/lib/sisu/v0/composite.rb
+++ b/lib/sisu/v0/composite.rb
@@ -77,6 +77,9 @@ module SiSU_Assemble
end
imagefile.close
end
+ output_path="#{@env.path.webserv}/#{@env.path.stub_pwd}/_sisu/image_external"
+ File.mkpath(output_path) unless FileTest.directory?(output_path)
+ SiSU_Env::System_call.new("#{path}/*",output_path,'q').rsync
end
def download_doc_skin(doc_skin) #first element in array is source url
path="#{@env.path.processing}/external_document/skin/doc"
diff --git a/lib/sisu/v0/embedded.rb b/lib/sisu/v0/embedded.rb
index f03f0aab..fdf38e7a 100644
--- a/lib/sisu/v0/embedded.rb
+++ b/lib/sisu/v0/embedded.rb
@@ -89,9 +89,11 @@ module SiSU_Embedded
and FileTest.directory?(src)
File.mkpath(ldest) unless FileTest.directory?(ldest)
src_ec="#{src}/" + @md.ec[:image].join(" #{src}/")
- SiSU_Env::System_call.new(src_ec,"#{ldest}/.",'q').rsync
- if @md.cmd.inspect =~/R/ #rsync to remote image directory
- SiSU_Env::System_call.new(src_ec,"#{rdest}/.",'q').rsync
+ unless @opt.fns =~/\.-sst$/
+ SiSU_Env::System_call.new(src_ec,"#{ldest}/.",'q').rsync
+ if @md.cmd.inspect =~/R/ #rsync to remote image directory
+ SiSU_Env::System_call.new(src_ec,"#{rdest}/.",'q').rsync
+ end
end
end
end
diff --git a/lib/sisu/v0/sysenv.rb b/lib/sisu/v0/sysenv.rb
index 0661aa13..b2215b64 100644
--- a/lib/sisu/v0/sysenv.rb
+++ b/lib/sisu/v0/sysenv.rb
@@ -1266,7 +1266,7 @@ WOK
end
end
def webserv_path #testing, check need, remove
- @webserv_path
+ webserv
end
def webserv #separation required for webrick which cannot use path.output (different requirements as no file is passed)
man_path=if @@man_path.nil?
@@ -2336,8 +2336,10 @@ p @zap
self.remote_host_base.each do |remote_conn|
local_gen=@source_path
local_gen_image="#{@env.path.webserv}/#{@env.path.stub_pwd}/_sisu/image"
+ local_gen_image_external="#{@env.path.webserv}/#{@env.path.stub_pwd}/_sisu/image_external"
remote_gen="#{remote_conn[:name]}/#{@env.path.stub_pwd}/."
remote_images="#{remote_conn[:name]}/#{@env.path.stub_pwd}/_sisu/image/."
+ remote_images="#{remote_conn[:name]}/#{@env.path.stub_pwd}/_sisu/image_external/."
local_src=@source_path_src
local_pod=@source_path_pod
remote_src="#{remote_conn[:name]}/#{@env.path.stub_src}/."
@@ -2356,6 +2358,8 @@ p @zap
if defined? @md.ec[:image]
images="#{local_gen_image}/" + @md.ec[:image].join(" #{local_gen_image}/")
System_call.new(images,remote_images,@opt.cmd).rsync
+ images_external="#{local_gen_image_external}/" + @md.ec[:image].join(" #{local_gen_image_external}/")
+ System_call.new(images_external,remote_images_external,@opt.cmd).rsync
end
elsif FileTest.file?("#{local_pod}/#{src_pod}")
System_call.new("#{local_pod}/#{src_pod}",remote_src,@opt.cmd).rsync