From b2ccc63796ce0bf17a8c75e857073c8440ee3955 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 12 Jan 2015 09:59:35 -0500 Subject: bin + c&d: RbConfig (instead of Config, switch) --- bin/sisu | 20 ++++++++++---------- data/doc/sisu/CHANGELOG_v5 | 2 ++ data/doc/sisu/CHANGELOG_v6 | 2 ++ lib/sisu/current/rexml.rb | 4 ++-- lib/sisu/current/se_info_system.rb | 10 +++++----- lib/sisu/develop/rexml.rb | 4 ++-- lib/sisu/develop/se_info_system.rb | 10 +++++----- 7 files changed, 28 insertions(+), 24 deletions(-) diff --git a/bin/sisu b/bin/sisu index 276b8ed8..80436d2a 100644 --- a/bin/sisu +++ b/bin/sisu @@ -31,7 +31,7 @@ class Orient end def sisu_run_from? if processing.called_as == processing.file_full_path \ - and File.dirname(processing.file_full_path) != Config::CONFIG['bindir'] + and File.dirname(processing.file_full_path) != RbConfig::CONFIG['bindir'] :full_path_to_sisu_bin_in_sisu_dir_tree elsif processing.file_full_path =~/\/gems\// \ and processing.file_full_path \ @@ -149,11 +149,11 @@ class Orient def paths_set if sisu_run_from? == :system_install \ and processing.called_as \ - =~ /^#{Config::CONFIG['bindir']}\/sisu[#{version.stable}#{version.unstable}]?$/ + =~ /^#{RbConfig::CONFIG['bindir']}\/sisu[#{version.stable}#{version.unstable}]?$/ :set_path_system elsif sisu_run_from? == :full_path_to_sisu_bin_in_sisu_dir_tree \ and processing.called_as \ - !~ /^#{Config::CONFIG['bindir']}\/sisu[#{version.stable}#{version.unstable}]?$/ \ + !~ /^#{RbConfig::CONFIG['bindir']}\/sisu[#{version.stable}#{version.unstable}]?$/ \ && File.expand_path(processing.called_as) \ =~ /bin\/sisu[#{version.stable}#{version.unstable}]?$/ \ && FileTest.file?(processing.called_as) @@ -166,7 +166,7 @@ class Orient def sisu_path_base case paths_set when :set_path_system - Config::CONFIG['datadir'] + '/sisu' + RbConfig::CONFIG['datadir'] + '/sisu' when :set_dir_tree_full_path File.expand_path(processing.called_as). sub(/\/bin\/sisu[#{version.stable}#{version.unstable}]?$/,'') @@ -178,7 +178,7 @@ class Orient def sisu_path_base_system_data case paths_set when :set_path_system - Config::CONFIG['datadir'] + '/sisu' + RbConfig::CONFIG['datadir'] + '/sisu' when :set_dir_tree_full_path File.expand_path(processing.called_as). sub(/\/bin\/sisu[#{version.stable}#{version.unstable}]?$/,'/data/sisu') @@ -189,7 +189,7 @@ class Orient end def sisu_path_specified_lib if (processing.called_as \ - !~ /^#{Config::CONFIG['bindir']}\/sisu[#{version.stable}#{version.unstable}]?$/) + !~ /^#{RbConfig::CONFIG['bindir']}\/sisu[#{version.stable}#{version.unstable}]?$/) File.expand_path(processing.called_as). sub(/bin\/sisu[#{version.stable}#{version.unstable}]?$/,'lib') else nil @@ -320,10 +320,10 @@ rescue #% - puts %{ #{%x{ruby -v}.strip.to_s} #{RUBY_VERSION} - ruby version: #{Config::CONFIG['RUBY_PROGRAM_VERSION']}p#{Config::CONFIG['PATCHLEVEL']} - ruby named: #{Config::CONFIG['ruby_version']} - rubylib: #{Config::CONFIG['rubylibdir']} - rubylib local: #{Config::CONFIG['sitelibdir']} + ruby version: #{RbConfig::CONFIG['RUBY_PROGRAM_VERSION']}p#{RbConfig::CONFIG['PATCHLEVEL']} + ruby named: #{RbConfig::CONFIG['ruby_version']} + rubylib: #{RbConfig::CONFIG['rubylibdir']} + rubylib local: #{RbConfig::CONFIG['sitelibdir']} gem dir: #{Gem.dir} gem path: #{Gem.path} } diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5 index f92646db..c0e9d59d 100644 --- a/data/doc/sisu/CHANGELOG_v5 +++ b/data/doc/sisu/CHANGELOG_v5 @@ -82,6 +82,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.8.0.orig.tar.xz marked up documents, i.e. to place translated versions of a sisu document under po4a management + * use RbConfig instead of Config + * sisu.org addition, modification, consider ** SiSU "UnFrozen" - prior to end of Debian Freeze diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6 index 33b82b20..6047115b 100644 --- a/data/doc/sisu/CHANGELOG_v6 +++ b/data/doc/sisu/CHANGELOG_v6 @@ -94,6 +94,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_6.4.0.orig.tar.xz * utils_composite, composite documents (.ssm) extract the list of insert files + * use RbConfig instead of Config + * sisu.org addition, modification, consider ** SiSU "UnFrozen" - prior to end of Debian Freeze diff --git a/lib/sisu/current/rexml.rb b/lib/sisu/current/rexml.rb index 8a0e62b5..9a11305c 100644 --- a/lib/sisu/current/rexml.rb +++ b/lib/sisu/current/rexml.rb @@ -58,7 +58,7 @@ module SiSU_Rexml # load XML file for REXML parsing begin require 'rexml/document' \ - if FileTest.directory?("#{Config::CONFIG['rubylibdir']}/rexml") #Config::CONFIG['sitedir'] + if FileTest.directory?("#{RbConfig::CONFIG['rubylibdir']}/rexml") #RbConfig::CONFIG['sitedir'] rescue LoadError SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia). error('rexml/document NOT FOUND (LoadError)') @@ -70,7 +70,7 @@ module SiSU_Rexml class Rexml begin require 'rexml/document' \ - if FileTest.directory?("#{Config::CONFIG['rubylibdir']}/rexml") #Config::CONFIG['sitedir'] + if FileTest.directory?("#{RbConfig::CONFIG['rubylibdir']}/rexml") #RbConfig::CONFIG['sitedir'] rescue LoadError SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia). error('rexml/document NOT FOUND (LoadError)') diff --git a/lib/sisu/current/se_info_system.rb b/lib/sisu/current/se_info_system.rb index 6fe0e33a..d1c9380f 100644 --- a/lib/sisu/current/se_info_system.rb +++ b/lib/sisu/current/se_info_system.rb @@ -65,11 +65,11 @@ module SiSU_Info_Sys_Gen error('rbconfig NOT FOUND (LoadError)') end @@user, @@home, @@hostname, @@pwd, @@sisu_etc, @@host, @@arch, @@rbver, @@dir_arch, @@dir_sitearch, @@dir_bin, @@locale, @@rc,@@sisurc_path,@@ad= - ENV['USER'],ENV['HOME'],ENV['HOSTNAME'],ENV['PWD'],Config::CONFIG['sysconfdir'] + '/sisu',Config::CONFIG['host'],Config::CONFIG['arch'],%x{ruby -v}.strip,Config::CONFIG['archdir'],Config::CONFIG['sitearchdir'],Config::CONFIG['bindir'],%x{locale charmap}.strip,nil, nil, {} # %x{ruby -v}.strip # Config::CONFIG['rb_ver'] - out=Config::CONFIG['localstatedir'] - etc=Config::CONFIG['sysconfdir'] + '/sisu' - share=Config::CONFIG['datadir'] + '/sisu' - data=Config::CONFIG['datadir'] + '/doc/sisu' + ENV['USER'],ENV['HOME'],ENV['HOSTNAME'],ENV['PWD'],RbConfig::CONFIG['sysconfdir'] + '/sisu',RbConfig::CONFIG['host'],RbConfig::CONFIG['arch'],%x{ruby -v}.strip,RbConfig::CONFIG['archdir'],RbConfig::CONFIG['sitearchdir'],RbConfig::CONFIG['bindir'],%x{locale charmap}.strip,nil, nil, {} # %x{ruby -v}.strip # RbConfig::CONFIG['rb_ver'] + out=RbConfig::CONFIG['localstatedir'] + etc=RbConfig::CONFIG['sysconfdir'] + '/sisu' + share=RbConfig::CONFIG['datadir'] + '/sisu' + data=RbConfig::CONFIG['datadir'] + '/doc/sisu' m=/.+\/(?:src\/)?(\S+)/m # m=/.+?\/(?:src\/)?([^\/]+)$/im # m=/.+\/(\S+)/m @stub_pwd ||=@@pwd[m,1] @base_markup_dir_stub=SiSU_Utils::Path.new.base_markup_stub diff --git a/lib/sisu/develop/rexml.rb b/lib/sisu/develop/rexml.rb index 07fabc93..977bf33c 100644 --- a/lib/sisu/develop/rexml.rb +++ b/lib/sisu/develop/rexml.rb @@ -58,7 +58,7 @@ module SiSU_Rexml # load XML file for REXML parsing begin require 'rexml/document' \ - if FileTest.directory?("#{Config::CONFIG['rubylibdir']}/rexml") #Config::CONFIG['sitedir'] + if FileTest.directory?("#{RbConfig::CONFIG['rubylibdir']}/rexml") #RbConfig::CONFIG['sitedir'] rescue LoadError SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia). error('rexml/document NOT FOUND (LoadError)') @@ -70,7 +70,7 @@ module SiSU_Rexml class Rexml begin require 'rexml/document' \ - if FileTest.directory?("#{Config::CONFIG['rubylibdir']}/rexml") #Config::CONFIG['sitedir'] + if FileTest.directory?("#{RbConfig::CONFIG['rubylibdir']}/rexml") #RbConfig::CONFIG['sitedir'] rescue LoadError SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia). error('rexml/document NOT FOUND (LoadError)') diff --git a/lib/sisu/develop/se_info_system.rb b/lib/sisu/develop/se_info_system.rb index 1c5019b2..be9e9d48 100644 --- a/lib/sisu/develop/se_info_system.rb +++ b/lib/sisu/develop/se_info_system.rb @@ -65,11 +65,11 @@ module SiSU_Info_Sys_Gen error('rbconfig NOT FOUND (LoadError)') end @@user, @@home, @@hostname, @@pwd, @@sisu_etc, @@host, @@arch, @@rbver, @@dir_arch, @@dir_sitearch, @@dir_bin, @@locale, @@rc,@@sisurc_path,@@ad= - ENV['USER'],ENV['HOME'],ENV['HOSTNAME'],ENV['PWD'],Config::CONFIG['sysconfdir'] + '/sisu',Config::CONFIG['host'],Config::CONFIG['arch'],%x{ruby -v}.strip,Config::CONFIG['archdir'],Config::CONFIG['sitearchdir'],Config::CONFIG['bindir'],%x{locale charmap}.strip,nil, nil, {} # %x{ruby -v}.strip # Config::CONFIG['rb_ver'] - out=Config::CONFIG['localstatedir'] - etc=Config::CONFIG['sysconfdir'] + '/sisu' - share=Config::CONFIG['datadir'] + '/sisu' - data=Config::CONFIG['datadir'] + '/doc/sisu' + ENV['USER'],ENV['HOME'],ENV['HOSTNAME'],ENV['PWD'],RbConfig::CONFIG['sysconfdir'] + '/sisu',RbConfig::CONFIG['host'],RbConfig::CONFIG['arch'],%x{ruby -v}.strip,RbConfig::CONFIG['archdir'],RbConfig::CONFIG['sitearchdir'],RbConfig::CONFIG['bindir'],%x{locale charmap}.strip,nil, nil, {} # %x{ruby -v}.strip # RbConfig::CONFIG['rb_ver'] + out=RbConfig::CONFIG['localstatedir'] + etc=RbConfig::CONFIG['sysconfdir'] + '/sisu' + share=RbConfig::CONFIG['datadir'] + '/sisu' + data=RbConfig::CONFIG['datadir'] + '/doc/sisu' m=/.+\/(?:src\/)?(\S+)/m # m=/.+?\/(?:src\/)?([^\/]+)$/im # m=/.+\/(\S+)/m @stub_pwd ||=@@pwd[m,1] @base_markup_dir_stub=SiSU_Utils::Path.new.base_markup_stub -- cgit v1.2.3