diff options
Diffstat (limited to 'lib/sisu/develop/se_get_init.rb')
| -rw-r--r-- | lib/sisu/develop/se_get_init.rb | 34 |
1 files changed, 22 insertions, 12 deletions
diff --git a/lib/sisu/develop/se_get_init.rb b/lib/sisu/develop/se_get_init.rb index 9bdafae3..569ea95e 100644 --- a/lib/sisu/develop/se_get_init.rb +++ b/lib/sisu/develop/se_get_init.rb @@ -82,29 +82,35 @@ module SiSU_Get_Init v=SiSU_Env::InfoVersion.instance.get_version [ $sisu_document_markup_directory_base_fixed_path \ - + '/.sisu/v' \ - + v[:branch_number], - $sisu_document_markup_directory_base_fixed_path \ + '/.sisu/' \ + v[:branch_name], $sisu_document_markup_directory_base_fixed_path \ - + '/.sisu', + + '/.sisu/' \ + + v[:branch_version], $sisu_document_markup_directory_base_fixed_path \ - + '/_sisu/v' \ - + v[:branch_number], + + '/.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/' \ - + SiSU_is[:version_dir], + + v[:branch_name], + @@home \ + + '/.sisu/' \ + + v[:branch_version], @@home \ + '/.sisu', \ @@sisu_etc \ + '/' \ - + SiSU_is[:version_dir], + + v[:branch_name], + @@sisu_etc \ + + '/' \ + + v[:branch_version], @@sisu_etc, ] end @@ -185,13 +191,17 @@ 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[:version_dir]}/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", - "#{$sisu_document_markup_directory_base_fixed_path}/_sisu/#{SiSU_is[:version_dir]}/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[:version_dir]}/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[:version_dir]}/skin/yml", + "#{@@sisu_etc}/#{SiSU_is[:branch_name]}/skin/yml", + "#{@@sisu_etc}/#{SiSU_is[:branch_version]}/skin/yml", "#{@@sisu_etc}/skin/yml", ] @ad_path.each do |v| |