aboutsummaryrefslogtreecommitdiffhomepage
path: root/lib/sisu/v0/sisupod_make.rb
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2007-10-15 02:09:59 +0100
committerRalph Amissah <ralph@amissah.com>2007-10-15 02:09:59 +0100
commit7c6478d290c854f26d4b954bb5ed47871ceefd62 (patch)
tree347b7fa55ed0412255757d1f081a5a32f9f02d49 /lib/sisu/v0/sisupod_make.rb
parentdefault image directories moved, more convenient/logical [test] (diff)
composite master renaming, and; multiple remote puts (rsync|scp)
* composite master files: eliminate ._sst, replace with .ssm.sst * multiple remote hosts ("distributed" rsyncing), yml config files remote now uses array with all recent changes (directory shunting) much testing is yet to be done, state is unstable some things are known not to work this instant, e.g. sisu -V
Diffstat (limited to 'lib/sisu/v0/sisupod_make.rb')
-rw-r--r--lib/sisu/v0/sisupod_make.rb12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/sisu/v0/sisupod_make.rb b/lib/sisu/v0/sisupod_make.rb
index 10ec76e5..392aee7d 100644
--- a/lib/sisu/v0/sisupod_make.rb
+++ b/lib/sisu/v0/sisupod_make.rb
@@ -73,7 +73,7 @@ module SiSU_Doc
else ''
end
@local_path="#{@env.path.output}/src" #@local_path="#{@env.path.output}/#{@env.fnb}"
- @zipfile=if @opt.fns =~/\._sst$/; @opt.fns.gsub(/(?:\~\S{2,3})?\._sst$/,'.ssm')
+ @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
File.mkpath(pod_path) unless FileTest.directory?(pod_path)
@@ -161,7 +161,7 @@ module SiSU_Doc
@rgx_image=/\{\s*(\S+?\.(?:png|jpg|gif))/
@rgx_skin=/^(?:@skin:|0~skin)\s+(\S+)/
@rgx_doc_import=/^%\s\s*\|(\S+?\.ss[ti])\|@\|\^\|>>ok/
- use_file=if @opt.fns =~/(?:\.ssm|\._sst)$/; "#{@env.path.composite_file}/#{@opt.fnb}._sst"
+ use_file=if @opt.fns =~/(?:\.ssm|\.ssm\.sst)$/; "#{@env.path.composite_file}/#{@opt.fnb}.ssm.sst"
else @opt.fns
end
file_array=IO.readlines(use_file,'')
@@ -170,7 +170,7 @@ module SiSU_Doc
if f !~/^%\s/
skin << f.scan(@rgx_skin).uniq.flatten if f =~@rgx_skin
images << f.scan(@rgx_image).uniq if f =~@rgx_image
- elsif f =~/^%\s/ and @opt.fns =~/\._sst$/
+ elsif f =~/^%\s/ and @opt.fns =~/\.ssm\.sst$/
doc_import << f.scan(@rgx_doc_import).uniq if f =~@rgx_doc_import
end
end
@@ -228,7 +228,7 @@ module SiSU_Doc
end
end
x=@env.document_language_versions_found #check multiple document language versions (param not used)
- if doc_import.flatten.length > 0 and @opt.fns =~/\._sst$/
+ if doc_import.flatten.length > 0 and @opt.fns =~/\.ssm\.sst$/
doc_import.flatten.each do |f|
cp_r("#{@env.path.pwd}/#{f}","#{@env.path.processing}/sisupod/#{f}")
end
@@ -237,8 +237,8 @@ module SiSU_Doc
x[:f].each do |f|
cp_r("#{@env.path.pwd}/#{f}","#{@env.path.processing}/sisupod/#{f}")
end
- elsif @opt.fns =~/\._sst/
- ssm=@opt.fns.gsub(/\._sst/,'.ssm')
+ elsif @opt.fns =~/\.ssm\.sst/
+ ssm=@opt.fns.gsub(/\.ssm\.sst/,'.ssm')
cp_r("#{@env.path.pwd}/#{ssm}","#{@env.path.processing}/sisupod/#{ssm}")
else cp_r("#{@env.path.pwd}/#{@opt.fns}","#{@env.path.processing}/sisupod/#{@opt.fns}")
end #NB not all possibilies met, revisit, also in case of composite file may wish to add README