diff options
author | Ralph Amissah <ralph@amissah.com> | 2007-10-15 02:09:59 +0100 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2007-10-15 02:09:59 +0100 |
commit | 7c6478d290c854f26d4b954bb5ed47871ceefd62 (patch) | |
tree | 347b7fa55ed0412255757d1f081a5a32f9f02d49 /lib/sisu/v0/urls.rb | |
parent | default 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/urls.rb')
-rw-r--r-- | lib/sisu/v0/urls.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/sisu/v0/urls.rb b/lib/sisu/v0/urls.rb index 1f9cfbe8..cfe242b3 100644 --- a/lib/sisu/v0/urls.rb +++ b/lib/sisu/v0/urls.rb @@ -86,7 +86,7 @@ module SiSU_urls fn_set_lang=SiSU_Env::Standardise_language.new.file_to_language(@opt.fns) @fnl=@env.i18n.lang_filename(fn_set_lang[:c]) @fn=SiSU_Env::Env_call.new(@opt.fns).lang(fn_set_lang[:c]) - @m_regular=/(.+?)\.(?:[_-]?sst|ssm)$/ + @m_regular=/(.+?)\.(?:(?:-|ssm\.)?sst|ssm)$/ @path=SiSU_Env::Info_env.new(@opt.fns) @webserv_url=@path.url.output_tell @tool=@env.program.text_editor @@ -97,7 +97,7 @@ module SiSU_urls @odf_viewer=@env.program.odf_viewer @manpage_gen=@env.program.manpage_generator source=if @opt.fns =~/\.sst$/; @opt.fns - elsif @opt.fns =~/\._sst/; "#@fnb.ssm.sst" + elsif @opt.fns =~/\.ssm\.sst/; "#@fnb.ssm.sst" else 'not recognised file' end @u ||= { @@ -217,7 +217,7 @@ module SiSU_urls @opt.cmd.gsub!(/P[iu]/,'') end if x=~/^[sS]/ and @opt.cmd =~/[sS]/ - zipfile=if @opt.fns =~/\._sst$/; y.gsub(/(?:\~\S{2,3})?(\._sst\.zip)$/,'.ssm.zip') + zipfile=if @opt.fns =~/\.ssm\.sst$/; y.gsub(/(?:\~\S{2,3})?(\.ssm\.sst\.zip)$/,'.ssm.zip') else y.gsub(/(?:\~\S{2,3})?(\.sst\.zip)$/,'\1') end tell=SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#@browser #@webserv_url/src/#{y}") |