From 3eaa952ac05221faa8e558aba79811025fdfdb50 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sun, 3 Oct 2010 22:39:25 -0400 Subject: urls, cleaning --- lib/sisu/v2/urls.rb | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/lib/sisu/v2/urls.rb b/lib/sisu/v2/urls.rb index 951a787a..d2493edd 100644 --- a/lib/sisu/v2/urls.rb +++ b/lib/sisu/v2/urls.rb @@ -207,21 +207,22 @@ module SiSU_urls if x=~/^D/ \ and @opt.cmd =~/D/ SiSU_Screen::Ansi.new(@opt.cmd,"-#{x} DBI psql","#{@pwd_stub}::#{@opt.fns}",y).result - @opt.cmd.gsub!(/D[iu]/,'') + @opt.cmd.gsub!(/D/,'') end if x=~/^d/ \ and @opt.cmd =~/d/ SiSU_Screen::Ansi.new(@opt.cmd,"-#{x} DBI sqlite","sqlite3 #{@env.path.output}/sisu_sqlite.db", "#{y}").result - @opt.cmd.gsub!(/d[iu]/,'') + @opt.cmd.gsub!(/d/,'') end if x=~/^e/ \ and @opt.cmd =~/e/ SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.epub_viewer} #{@env.path.output}/epub/#{y}").result + @opt.cmd.gsub!(/e/,'') end if x=~/^i/ \ and @opt.cmd =~/i/ SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.manpage_viewer} #{@env.path.manpage}/#{@fnb}.1").result - @opt.cmd.gsub!(/I/,'') + @opt.cmd.gsub!(/i/,'') end if x=~/^P/ \ and @opt.cmd =~/P/ @@ -231,15 +232,15 @@ module SiSU_urls if x=~/^s/ \ and @opt.cmd =~/s/ SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.web_browser} #{@env.url.output_tell}/src/#{y}").result - @opt.cmd.gsub!(/I/,'') + @opt.cmd.gsub!(/s/,'') end if x=~/^S/ \ - and @opt.cmd =~/[sS]/ + and @opt.cmd =~/S/ 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 SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.web_browser} #{@env.url.output_tell}/pod/#{y}").result - @opt.cmd.gsub!(/I/,'') + @opt.cmd.gsub!(/S/,'') end end urls_maintenance(@opt,x,y) if @opt.cmd =~/[MV]/ -- cgit v1.2.3