diff options
| -rw-r--r-- | bin/sisu | 2 | ||||
| -rw-r--r-- | data/doc/sisu/CHANGELOG_v4 | 3 | ||||
| -rw-r--r-- | lib/sisu/v4/sysenv.rb | 16 |
3 files changed, 13 insertions, 8 deletions
@@ -138,6 +138,7 @@ WOK if FileTest.directory?(markup_dir) system("cd #{markup_dir}") Dir.chdir(markup_dir) + $sisu_document_markup_directory_base_fixed_path=Dir.pwd.gsub(/\/(?:#{lng_lst_rgx})$/,'') SiSU::HubMaster.new(argv_sub) Dir.chdir(SiSU_called_from_directory) system("cd #{SiSU_called_from_directory}") @@ -146,6 +147,7 @@ WOK end else $sisu_document_markup_directory=Dir.pwd.gsub(/\/$/,'') + $sisu_document_markup_directory_base_fixed_path=Dir.pwd.gsub(/(^|\/)(?:#{lng_lst_rgx})$/,'') SiSU::HubMaster.new(argv) end rescue diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4 index 6cbc23a1..0613f2ac 100644 --- a/data/doc/sisu/CHANGELOG_v4 +++ b/data/doc/sisu/CHANGELOG_v4 @@ -25,6 +25,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_4.0.1.orig.tar.xz sisu_4.0.1-1.dsc sisu_4.0.1-1.debian.tar.gz +* v4: bin/sisu & sysenv, rc_path_options, provide fixed path to rc files, (used + e.g. to load sisurc.yml) + * v4: debug (internal code use), color markers for line number & file name (colored location markers to show when line passed within running code) diff --git a/lib/sisu/v4/sysenv.rb b/lib/sisu/v4/sysenv.rb index f1dfdb16..f41417fa 100644 --- a/lib/sisu/v4/sysenv.rb +++ b/lib/sisu/v4/sysenv.rb @@ -284,10 +284,10 @@ module SiSU_Env end def rc_path_options @rc_path=[ - "#{$sisu_document_markup_directory}/.sisu/#{SiSU_version_dir}", - "#{$sisu_document_markup_directory}/.sisu", - "#{$sisu_document_markup_directory}/_sisu/#{SiSU_version_dir}", - "#{$sisu_document_markup_directory}/_sisu", + "#{$sisu_document_markup_directory_base_fixed_path}/.sisu/#{SiSU_version_dir}", + "#{$sisu_document_markup_directory_base_fixed_path}/.sisu", + "#{$sisu_document_markup_directory_base_fixed_path}/_sisu/#{SiSU_version_dir}", + "#{$sisu_document_markup_directory_base_fixed_path}/_sisu", "#{@@home}/.sisu/#{SiSU_version_dir}", "#{@@home}/.sisu", "#{@@sisu_etc}/#{SiSU_version_dir}", @@ -361,10 +361,10 @@ module SiSU_Env tell_no_yaml='WARNING - YAML loading switched off, to enable delete the file:' if @markup_dir_changed_ @ad_path=[ - "#{$sisu_document_markup_directory}/.sisu/#{SiSU_version_dir}/skin/yml", - "#{$sisu_document_markup_directory}/.sisu/skin/yml", - "#{$sisu_document_markup_directory}/_sisu/#{SiSU_version_dir}/skin/yml", - "#{$sisu_document_markup_directory}/_sisu/skin/yml", + "#{$sisu_document_markup_directory_base_fixed_path}/.sisu/#{SiSU_version_dir}/skin/yml", + "#{$sisu_document_markup_directory_base_fixed_path}/.sisu/skin/yml", + "#{$sisu_document_markup_directory_base_fixed_path}/_sisu/#{SiSU_version_dir}/skin/yml", + "#{$sisu_document_markup_directory_base_fixed_path}/_sisu/skin/yml", "#{@@home}/.sisu/#{SiSU_version_dir}/skin/yml", "#{@@home}/.sisu/skin/yml", "#{@@sisu_etc}/#{SiSU_version_dir}/skin/yml", |