aboutsummaryrefslogtreecommitdiffhomepage
path: root/lib/sisu/v2/urls.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/sisu/v2/urls.rb')
-rw-r--r--lib/sisu/v2/urls.rb11
1 files changed, 4 insertions, 7 deletions
diff --git a/lib/sisu/v2/urls.rb b/lib/sisu/v2/urls.rb
index fd88f1ac..56b93a78 100644
--- a/lib/sisu/v2/urls.rb
+++ b/lib/sisu/v2/urls.rb
@@ -123,8 +123,7 @@ module SiSU_urls
end
def songsheet
begin
- urls_all if @opt.cmd=~/U/
- urls_select unless @opt.cmd=~/q/
+ @opt.cmd=~/U/ ? urls_all : (urls_select unless @opt.cmd=~/q/)
rescue; SiSU_Errors::Info_error.new($!,$@,@opt.cmd,@opt.fns).error
ensure
end
@@ -248,10 +247,8 @@ module SiSU_urls
end
end
def urls_all
- if @opt.cmd =~/[MVv]/
- SiSU_Screen::Ansi.new(@opt.cmd,'URLs').grey_title_hi
- SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"#{@env.path.output}/#{@fnb}").flow
- end
+ i="(output manifest) #{@env.url.output_tell}/#{@fnb}/sisu_manifest.html"
+ SiSU_Screen::Ansi.new(@opt.cmd,'URLs',i).grey_title_hi
@u.each do |x,y|
tell=case x
when /^m/
@@ -268,7 +265,7 @@ module SiSU_urls
when /^i/
SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.manpage_generator} #{@env.path.manpage}/#{@fnb}.1 |most")
end
- if @opt.cmd =~/[MVv]/
+ unless @opt.cmd =~/q/
tellx.result if tellx
tell.result if tell
end