diff options
| author | Ralph Amissah <ralph@amissah.com> | 2015-05-01 18:51:40 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2015-05-01 18:51:40 -0400 |
| commit | 58d01ddb946f666b2bc70b867314c00b1e78b1e3 (patch) | |
| tree | 6ed99ea64d1ad4b02a1c8f901fb6248af9abfe08 /lib/sisu/current/se_get_init.rb | |
| parent | debian/changelog (5.8.0-1) (diff) | |
| parent | version & changelog, tag for release (diff) | |
Merge tag 'sisu_6.5.0' into debian/sid
SiSU 6.5.0
Diffstat (limited to 'lib/sisu/current/se_get_init.rb')
| -rw-r--r-- | lib/sisu/current/se_get_init.rb | 44 |
1 files changed, 36 insertions, 8 deletions
diff --git a/lib/sisu/current/se_get_init.rb b/lib/sisu/current/se_get_init.rb index a299cd10..1a28a5ac 100644 --- a/lib/sisu/current/se_get_init.rb +++ b/lib/sisu/current/se_get_init.rb @@ -79,15 +79,39 @@ module SiSU_Get_Init @@tx ||=SiSU_Parts_TeXpdf::TeX.new end def rc_path_options + v=SiSU_Env::InfoVersion.instance.get_version [ - "#{$sisu_document_markup_directory_base_fixed_path}/.sisu/#{SiSU_is.branch_version?}", - "#{$sisu_document_markup_directory_base_fixed_path}/.sisu", - "#{$sisu_document_markup_directory_base_fixed_path}/_sisu/#{SiSU_is.branch_version?}", - "#{$sisu_document_markup_directory_base_fixed_path}/_sisu", - "#{@@home}/.sisu/#{SiSU_is.branch_version?}", - "#{@@home}/.sisu", - "#{@@sisu_etc}/#{SiSU_is.branch_version?}", - "#{@@sisu_etc}", + $sisu_document_markup_directory_base_fixed_path \ + + '/.sisu/' \ + + v.branch_name, + $sisu_document_markup_directory_base_fixed_path \ + + '/.sisu/' \ + + v.branch_version, + $sisu_document_markup_directory_base_fixed_path \ + + '/.sisu', + $sisu_document_markup_directory_base_fixed_path \ + + '/_sisu/' \ + + v.branch_name, + $sisu_document_markup_directory_base_fixed_path \ + + '/_sisu/' \ + + v.branch_version, + $sisu_document_markup_directory_base_fixed_path \ + + '/_sisu', + @@home \ + + '/.sisu/' \ + + v.branch_name, + @@home \ + + '/.sisu/' \ + + v.branch_version, + @@home \ + + '/.sisu', \ + @@sisu_etc \ + + '/' \ + + v.branch_name, + @@sisu_etc \ + + '/' \ + + v.branch_version, + @@sisu_etc, ] end def sisu_document_make @@ -167,12 +191,16 @@ module SiSU_Get_Init tell_no_yaml='WARNING - YAML loading switched off, to enable delete the file:' if @markup_dir_changed_ @ad_path=[ + "#{$sisu_document_markup_directory_base_fixed_path}/.sisu/#{SiSU_is.branch_name?}/skin/yml", "#{$sisu_document_markup_directory_base_fixed_path}/.sisu/#{SiSU_is.branch_version?}/skin/yml", "#{$sisu_document_markup_directory_base_fixed_path}/.sisu/skin/yml", + "#{$sisu_document_markup_directory_base_fixed_path}/_sisu/#{SiSU_is.branch_name?}/skin/yml", "#{$sisu_document_markup_directory_base_fixed_path}/_sisu/#{SiSU_is.branch_version?}/skin/yml", "#{$sisu_document_markup_directory_base_fixed_path}/_sisu/skin/yml", + "#{@@home}/.sisu/#{SiSU_is.branch_name?}/skin/yml", "#{@@home}/.sisu/#{SiSU_is.branch_version?}/skin/yml", "#{@@home}/.sisu/skin/yml", + "#{@@sisu_etc}/#{SiSU_is.branch_name?}/skin/yml", "#{@@sisu_etc}/#{SiSU_is.branch_version?}/skin/yml", "#{@@sisu_etc}/skin/yml", ] |