Merge tag 'sisu_5.3.1' into debian/sid

SiSU 5.3.1

1 files changed, 15 insertions, 7 deletions

diff --git a/lib/sisu/v6/webrick.rb b/lib/sisu/v6/webrick.rb
index 7a66a1af..97e6548d 100644
--- a/lib/sisu/v6/webrick.rb
+++ b/lib/sisu/v6/webrick.rb
@@ -63,12 +63,16 @@
 =end
 module SiSU_Webserv
   class WebrickStart
+    begin
+      require 'time'
       require 'webrick'
         include WEBrick
-      require 'time'
-      require_relative 'sysenv'                             # sysenv.rb
-        include SiSU_Env
-        include SiSU_Screen
+    rescue LoadError
+      SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).error('time or webrick NOT FOUND (LoadError)')
+    end
+    require_relative 'sysenv'                             # sysenv.rb
+      include SiSU_Env
+      include SiSU_Screen
     def initialize
     begin                                                                          #%
       @cX=SiSU_Screen::Ansi.new('yes').cX
@@ -97,9 +101,13 @@ module SiSU_Webserv
                                                                #% wb_top
       wb_top=%q(#!/usr/bin/env ruby
       # * arch-tag: webrick info on environment, mounted directories, and contents of pwd
-      require 'time'
-      require 'cgi'
-      require 'fcgi'
+      begin
+        require 'time'
+        require 'cgi'
+        require 'fcgi'
+      rescue LoadError
+        puts 'time, cgi or fcgi NOT FOUND (LoadError)'
+      end
       ls=Dir.entries('./')
       dir_contents=[]
       ls.each { |x| dir_contents << "<a href=\"./#{x}/\">#{x}</a><br>" unless x =~/^(\.)+$/ }