From 8c67d466ead2096d713515c88fcee17c473ecde5 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Fri, 19 Oct 2007 20:28:48 +0100 Subject: mostly paths for shared markup source (txt and pod), also... also current Debian/Sid ruby1.9 upgrade removes a bug, so a related test/warning in options.rb removed --- lib/sisu/v0/urls.rb | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'lib/sisu/v0/urls.rb') diff --git a/lib/sisu/v0/urls.rb b/lib/sisu/v0/urls.rb index b9b1e0ec..ca1b6928 100644 --- a/lib/sisu/v0/urls.rb +++ b/lib/sisu/v0/urls.rb @@ -192,7 +192,7 @@ module SiSU_urls tell.grey_title_hi unless @opt.cmd =~/q/ tell=SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"#{@env.path.output}/#@fnb") tell.flow unless @opt.cmd =~/q/ - m=/.+\/(\S+)/m + m=/.+\/(?:src\/)?(\S+)/im # m=/.+?\/(?:src\/)?([^\/]+)$/im # m=/.+\/(\S+)/m @pwd_stub="#@webserv_url"[m,1] @u.each do |x,y| if @opt.fns =~ @m_regular @@ -234,12 +234,18 @@ module SiSU_urls tell.result unless @opt.cmd =~/q/ @opt.cmd.gsub!(/P[iu]/,'') end - if x=~/^[sS]/ \ + if x=~/^s/ \ + and @opt.cmd =~/s/ + tell=SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#@browser #@webserv_url/src/#{y}") + tell.result unless @opt.cmd =~/q/ + @opt.cmd.gsub!(/I/,'') + end + if x=~/^S/ \ and @opt.cmd =~/[sS]/ 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}") + tell=SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#@browser #@webserv_url/pod/#{y}") tell.result unless @opt.cmd =~/q/ @opt.cmd.gsub!(/I/,'') end -- cgit v1.2.3