aboutsummaryrefslogtreecommitdiffhomepage
path: root/lib/sisu/v3/hub.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/sisu/v3/hub.rb')
-rw-r--r--lib/sisu/v3/hub.rb54
1 files changed, 27 insertions, 27 deletions
diff --git a/lib/sisu/v3/hub.rb b/lib/sisu/v3/hub.rb
index 51b3e429..4fdbdf89 100644
--- a/lib/sisu/v3/hub.rb
+++ b/lib/sisu/v3/hub.rb
@@ -58,8 +58,8 @@
=end
module SiSU
- require "#{SiSU_lib}/constants" # constants.rb
- require "#{SiSU_lib}/sysenv" # sysenv.rb
+ require_relative 'constants' # constants.rb
+ require_relative 'sysenv' # sysenv.rb
include SiSU_Screen
@@pwd_the=Dir.pwd
class Op
@@ -85,7 +85,7 @@ module SiSU
Dir.chdir(@pwd)
end
def select
- require "#{SiSU_lib}/#{@req}"
+ require_relative @req
if @req =~/^conf$/ # -C
SiSU_Initialize::Source.new(@opt).read
end
@@ -94,7 +94,7 @@ module SiSU
env=SiSU_Env::Info_env.new(fns)
if fns =~ /sisupod(?:\.zip)?|\S+?(?:\.ss[mt]\.zip|\.ssp)$/
# env=SiSU_Env::Info_env.new(fns)
- require "#{SiSU_lib}/remote" # remote.rb #check
+ require_relative 'remote' # remote.rb #check
pod_name=SiSU_Remote::Remote_download.new(fns).pod.name
SiSU_Screen::Ansi.new(@opt.cmd,pod_name).puts_blue unless @opt.cmd =~/q/
@opt.files.shift
@@ -111,13 +111,13 @@ module SiSU
if @req !~/(?:urls|remote)$/
if @opt.cmd.inspect =~/-P/\
and @req =~ /^po4a$/
- require "#{SiSU_lib}/composite" # composite.rb #pre-processing
+ require_relative 'composite' # composite.rb #pre-processing
SiSU_po4a::Source.new(@opt).read # -P po4a.rb
elsif @req=~/^dal$/ \
and FileTest.file?(@opt.fns) \
and @opt.fns =~ /\.(?:(?:-|ssm\.)?sst|ssm)$/
if fns =~ /\.ssm$/
- require "#{SiSU_lib}/composite" # composite.rb #pre-processing
+ require_relative 'composite' # composite.rb #pre-processing
SiSU_Assemble::Composite.new(@opt).read
@opt.fns=fns.gsub(/\.ssm$/,'.ssm.sst')
end
@@ -128,7 +128,7 @@ module SiSU
case @req
when /^dal$/
if fns =~ /\.ssm$/
- require "#{SiSU_lib}/composite" # composite.rb #pre-processing
+ require_relative 'composite' # composite.rb #pre-processing
SiSU_Assemble::Composite.new(@opt).read
@opt.fns=fns.gsub(/\.ssm$/,'.ssm.sst')
end
@@ -206,30 +206,30 @@ module SiSU
end
def remote_put_base_site_rsync # -CR
p "here #{__FILE__} #{__LINE__}" if @opt =~/M/
- require "#{SiSU_lib}/remote" # remote.rb
+ require_relative 'remote' # remote.rb
SiSU_Remote::Put.new(@opt).rsync_base
end
def remote_put_base_site_rsync_match # -CCRZ
p "here #{__FILE__} #{__LINE__}" if @opt =~/M/
- require "#{SiSU_lib}/remote" # remote.rb
+ require_relative 'remote' # remote.rb
SiSU_Remote::Put.new(@opt).rsync_base_sync
end
def remote_put_base_site # -Cr
p "here #{__FILE__} #{__LINE__}" if @opt =~/M/
- require "#{SiSU_lib}/remote" # remote.rb
+ require_relative 'remote' # remote.rb
SiSU_Remote::Put.new(@opt).scp_base
end
def remote_put_base_site_all # -CCr
p "here #{__FILE__} #{__LINE__}" if @opt =~/M/
- require "#{SiSU_lib}/remote" # remote.rb
+ require_relative 'remote' # remote.rb
SiSU_Remote::Put.new(@opt).scp_base_all
end
def cgi # -F
- require "#{SiSU_lib}/cgi" # cgi.rb
+ require_relative 'cgi' # cgi.rb
SiSU_CGI::SiSU_search.new(@opt).read
end
def encoding # -K build character encoding db (uses KirbyBase)
- require "#{SiSU_lib}/character_encoding" # character_encoding.rb
+ require_relative 'character_encoding' # character_encoding.rb
SiSU_character_encode::Create.new.db
end
def termsheet # -t
@@ -288,10 +288,10 @@ p "here #{__FILE__} #{__LINE__}" if @opt =~/M/
require 'profile'
end
if @opt.mod.inspect =~/--harvest/
- require "#{SiSU_lib}/harvest" # harvest.rb
+ require_relative 'harvest' # harvest.rb
end
if @opt.mod.inspect =~/--convert|--to|--from/
- require "#{SiSU_lib}/sst_convert_markup" # sst_convert_markup.rb
+ require_relative 'sst_convert_markup' # sst_convert_markup.rb
end
if @opt.cmd =~/([AabCcDdeFfGgHhIiJjkLMmNnOoPpQqRrSsTtUuVvwWXxYyZ_0-9])/ \
and @opt.cmd =~/^-/ \
@@ -401,12 +401,12 @@ p "here #{__FILE__} #{__LINE__}" if @opt =~/M/
end
end
if @get_s.length > 0 #% remote markup file .sst
- require "#{SiSU_lib}/remote" # remote.rb
+ require_relative 'remote' # remote.rb
SiSU_Remote::Get.new(@opt,@get_s).fns
Operations.new.counter
end
if @get_p.length > 0 #% remote sisupod
- require "#{SiSU_lib}/remote" # remote.rb
+ require_relative 'remote' # remote.rb
SiSU_Remote::Get.new(@opt,@get_p).sisupod
end
rescue
@@ -512,10 +512,10 @@ p "here #{__FILE__} #{__LINE__}" if @opt =~/M/
rm_rf(@@env.user) unless @opt.cmd =~/M/
end end
elsif @opt.mod.inspect =~/--query/
- require "#{SiSU_lib}/sst_identify_markup" # sst_identify_markup.rb
+ require_relative 'sst_identify_markup' # sst_identify_markup.rb
puts SiSU_Markup::Markup_history.new(@opt).query
elsif @opt.mod.inspect =~/--identify/
- require "#{SiSU_lib}/sst_identify_markup" # sst_identify_markup.rb
+ require_relative 'sst_identify_markup' # sst_identify_markup.rb
markup_version=SiSU_Markup::Markup_identify.new(@opt).markup_version?
elsif @opt.mod.inspect =~/--about/ #% help instructions
if @opt.mod.inspect =~/--about/ \
@@ -524,10 +524,10 @@ p "here #{__FILE__} #{__LINE__}" if @opt =~/M/
else SiSU_Help::Help.new('list','color_off').help_request
end
elsif @opt.mod.inspect =~/--sitemaps/ #% sitemaps
- require "#{SiSU_lib}/sitemaps" # sitemaps.rb
+ require_relative 'sitemaps' # sitemaps.rb
SiSU_Sitemaps::Source.new(@opt).read
if @opt.cmd =~/R/
- require "#{SiSU_lib}/remote" # remote.rb
+ require_relative 'remote' # remote.rb
SiSU_Remote::Put.new(@opt).rsync_sitemaps
end
else #% help instructions
@@ -571,15 +571,15 @@ p "here #{__FILE__} #{__LINE__}" if @opt =~/M/
require 'jcode'
$KCODE='UTF8'
end
- require "#{SiSU_lib}/constants" # constants.rb
- require "#{SiSU_lib}/options" # options.rb
- require "#{SiSU_lib}/sysenv" # sysenv.rb
+ require_relative 'constants' # constants.rb
+ require_relative 'options' # options.rb
+ require_relative 'sysenv' # sysenv.rb
include SiSU_Env; include SiSU_Screen
- require "#{SiSU_lib}/param" # param.rb
+ require_relative 'param' # param.rb
include SiSU_Param
- require "#{SiSU_lib}/defaults" # defaults.rb
+ require_relative 'defaults' # defaults.rb
include SiSU_Viz
- require "#{SiSU_lib}/help" # help.rb
+ require_relative 'help' # help.rb
include SiSU_Help
require 'uri'
home=ENV['HOME']