From 7c6478d290c854f26d4b954bb5ed47871ceefd62 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 15 Oct 2007 02:09:59 +0100 Subject: 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 --- lib/sisu/v0/options.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib/sisu/v0/options.rb') diff --git a/lib/sisu/v0/options.rb b/lib/sisu/v0/options.rb index 7f94306e..a4cdc5e4 100644 --- a/lib/sisu/v0/options.rb +++ b/lib/sisu/v0/options.rb @@ -102,7 +102,7 @@ module SiSU_commandline end if x =~/^--\S+/; m << x end - elsif x =~ /(?:\.(?:[_-]?sst(?:\.xml)?|ssm|ssi|sx[sdn]\.xml|s[1-3]|kdi|ssp)|sisupod(?:\.zip)?)$/ + elsif x =~ /(?:\.(?:(?:-|ssm\.)?sst(?:\.xml)?|ssm|ssi|sx[sdn]\.xml|s[1-3]|kdi|ssp)|sisupod(?:\.zip)?)$/ if x =~/^(?:https?|file):\/\/\S+/; f << x elsif FileTest.file?(x); f << x else puts "file not found: #{x}" @@ -162,16 +162,16 @@ module SiSU_commandline end def fnb unless fns.empty? - fns[/(.+?)\.(?:[_-]?sst|ssm)$/,1] + fns[/(.+?)\.(?:(?:-|ssm\.)?sst|ssm)$/,1] end end def fnc - @fnc=if @fns =~/\.(?:_sst|ssm)$/; fnb + '.ssm.sst' + @fnc=if @fns =~/\.(?:ssm\.sst|ssm)$/; fnb + '.ssm.sst' else @fns end end def fncb - @fncb=if @fns =~/(?:\~\S{2,3})?\.(?:_sst|ssm)$/; fnb + '.ssm.sst' + @fncb=if @fns =~/(?:\~\S{2,3})?\.(?:ssm\.sst|ssm)$/; fnb + '.ssm.sst' else @fns.gsub(/(?:\~\S{2,3})?(\.sst)$/,'\1') end end -- cgit v1.2.3