diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sisu/db_import.rb | 2 | ||||
| -rw-r--r-- | lib/sisu/se.rb | 2 | ||||
| -rw-r--r-- | lib/sisu/se_info_env.rb | 2 | ||||
| -rw-r--r-- | lib/sisu/se_standardise_lang.rb | 2 | ||||
| -rw-r--r-- | lib/sisu/se_version.rb | 5 | ||||
| -rw-r--r-- | lib/sisu/utils_screen_text_color.rb | 2 |
6 files changed, 9 insertions, 6 deletions
diff --git a/lib/sisu/db_import.rb b/lib/sisu/db_import.rb index f021fea5..84cbc911 100644 --- a/lib/sisu/db_import.rb +++ b/lib/sisu/db_import.rb @@ -311,7 +311,7 @@ module SiSU_DbImport if (@opt.act[:verbose][:set]==:on \ || @opt.act[:verbose_plus][:set]==:on \ || @opt.act[:maintenance][:set]==:on) - puts %{\n#{@cX.grey}Processing file number#{@cX.off}: #{@cX.green}#{@@id_t}#{@@cX.off}} + puts %{\n#{@cX.grey}Processing file number#{@cX.off}: #{@cX.green}#{@@id_t}#{@cX.off}} end end ################ CLEAR ############## diff --git a/lib/sisu/se.rb b/lib/sisu/se.rb index 8e44434b..009784f3 100644 --- a/lib/sisu/se.rb +++ b/lib/sisu/se.rb @@ -50,8 +50,8 @@ # <https://git.sisudoc.org/projects/> # <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary> # <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary> -@@cX=nil module SiSU_Env + #@@cX=nil require_relative 'constants' # constants.rb require_relative 'utils' # utils.rb require_relative 'se_date' # se_date.rb diff --git a/lib/sisu/se_info_env.rb b/lib/sisu/se_info_env.rb index bdcafe42..382facf1 100644 --- a/lib/sisu/se_info_env.rb +++ b/lib/sisu/se_info_env.rb @@ -50,8 +50,8 @@ # <https://git.sisudoc.org/projects/> # <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary> # <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary> -@@current_document=Dir.pwd #nil #'' module SiSU_Info_Env + @@current_document=Dir.pwd #nil #'' require_relative 'se_envcall' # se_envcall.rb require_relative 'html_parts' # html_parts.rb begin diff --git a/lib/sisu/se_standardise_lang.rb b/lib/sisu/se_standardise_lang.rb index 1a513b02..688ececa 100644 --- a/lib/sisu/se_standardise_lang.rb +++ b/lib/sisu/se_standardise_lang.rb @@ -50,8 +50,8 @@ # <https://git.sisudoc.org/projects/> # <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary> # <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary> -@@lang_info=nil module SiSU_Standardise_Lang + @@lang_info=nil class StandardiseLanguage require_relative 'i18n' # i18n.rb def initialize(l='') diff --git a/lib/sisu/se_version.rb b/lib/sisu/se_version.rb index 44062ec4..adf3b9be 100644 --- a/lib/sisu/se_version.rb +++ b/lib/sisu/se_version.rb @@ -105,7 +105,10 @@ module SiSU_Info_Version version_details_hash[:version] end def version_major - @version_major=version_details_hash[:version].gsub(/([0-9]+)\.[0-9]+\.[0-9]+/,'\1') + @version_major=if (version_details_hash[:version]) + version_details_hash[:version].gsub(/([0-9]+)\.[0-9]+\.[0-9]+/,'\1') + else "" + end end def install_method version_details_hash[:install_method] diff --git a/lib/sisu/utils_screen_text_color.rb b/lib/sisu/utils_screen_text_color.rb index 5b21cb45..da214179 100644 --- a/lib/sisu/utils_screen_text_color.rb +++ b/lib/sisu/utils_screen_text_color.rb @@ -62,7 +62,7 @@ module SiSU_Screen def initialize(color_state,*txt) @color_state,@txt=color_state,txt @color_instruct=txt[0] - @cX=@@cX=if color_state==:on + @cX=if color_state==:on Color.new do self.off=self.white=self.white_bold=self.marker=self.bold=self.underline=self.invert=self.darkgrey_hi=self.grey_hi=self.pink_hi=self.fuchsia_hi=self.red_hi=self.orange_hi=self.yellow_hi=self.brown_hi=self.lightgreen_hi=self.green_hi=self.cyan_hi=self.blue_hi=self.navy_hi=self.grey=self.pink=self.fuchsia=self.ruby=self.red=self.orange=self.yellow=self.brown=self.green=self.darkgreen=self.cyan=self.blue=self.navy=self.black='' end |