aboutsummaryrefslogtreecommitdiffhomepage
path: root/lib
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2010-05-12 22:42:32 -0400
committerRalph Amissah <ralph@amissah.com>2010-05-12 22:42:32 -0400
commit2f70bd465f3f68b738307274cde556412e017a32 (patch)
tree103df401f371c45c00360578dc562ffd057d5b65 /lib
parentsha256 (2.3.3) (diff)
urls, screen output control
Diffstat (limited to 'lib')
-rw-r--r--lib/sisu/v2/hub.rb5
-rw-r--r--lib/sisu/v2/urls.rb8
2 files changed, 5 insertions, 8 deletions
diff --git a/lib/sisu/v2/hub.rb b/lib/sisu/v2/hub.rb
index bab13ed1..b182a31e 100644
--- a/lib/sisu/v2/hub.rb
+++ b/lib/sisu/v2/hub.rb
@@ -484,9 +484,8 @@ p "here #{__FILE__} #{__LINE__}" if @opt =~/M/
end
else
end
- unless @opt.cmd =~/[q]/; op('urls','urls') #% unless -q
- end
- @msg,@msgs="\tsisu -W [to start ruby web-server on output directory]\n",nil
+ op('urls','urls')
+ @msg,@msgs="\tsisu -W [to start ruby web-server on output directory]\n",nil unless @opt.cmd =~/q/
@tell.call.print_brown if @opt.cmd =~/[uUvVM]/ unless @opt.files.join.empty?
if defined? @@env.path.processing \
and FileTest.directory?(@@env.path.processing) \
diff --git a/lib/sisu/v2/urls.rb b/lib/sisu/v2/urls.rb
index fd88f1ac..01e8e657 100644
--- a/lib/sisu/v2/urls.rb
+++ b/lib/sisu/v2/urls.rb
@@ -248,10 +248,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 +266,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