diff options
Diffstat (limited to 'lib/sisu/v3/git.rb')
-rw-r--r-- | lib/sisu/v3/git.rb | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/lib/sisu/v3/git.rb b/lib/sisu/v3/git.rb index b14645c9..9d1d9332 100644 --- a/lib/sisu/v3/git.rb +++ b/lib/sisu/v3/git.rb @@ -1,4 +1,4 @@ -# coding: utf-8 +# encoding: utf-8 =begin * Name: SiSU @@ -57,9 +57,9 @@ =end module SiSU_Git - require "#{SiSU_lib}/param" # param.rb - require "#{SiSU_lib}/sysenv" # sysenv.rb - require "#{SiSU_lib}/dal" # dal.rb + require_relative 'param' # param.rb + require_relative 'sysenv' # sysenv.rb + require_relative 'dal' # dal.rb class Source include FileUtils #::Verbose def initialize(opt) @@ -78,7 +78,7 @@ module SiSU_Git fnb=@fnn=@opt.fns[m,1] fnt=@opt.fns[m,2] end - git_path_fnb=@env.path.processing_path_git + '/' + fnb + git_path_fnb=@env.processing_path.git + '/' + fnb #unless @opt.cmd =~/q/ # @opt.cmd=~/[MVvz]/ \ # ? SiSU_Screen::Ansi.new(@opt.cmd,'Git path',@git_path[:fnb]).green_hi_blue \ @@ -87,16 +87,16 @@ module SiSU_Git #end lng=(@md.opt.f_pth[:lng]) ? (@md.opt.f_pth[:lng]) : (@md.i18n[0]) @git_path={ - :fnb=> git_path_fnb, - :src=> git_path_fnb + '/' + Gt[:src] + '/' + lng, - :po=> git_path_fnb + '/' + Gt[:po] + '/' + lng, - :pot=> git_path_fnb + '/' + Gt[:pot], - :conf=> git_path_fnb + '/' + Gt[:conf], - :skin=> git_path_fnb + '/' + Gt[:skin], - :image=>git_path_fnb + '/' + Gt[:image], - :audio=>git_path_fnb + '/' + Gt[:audio], - :video=>git_path_fnb + '/' + Gt[:video], - :conf=> git_path_fnb + '/' + Gt[:conf] + fnb: git_path_fnb, + src: git_path_fnb + '/' + Gt[:src] + '/' + lng, + po: git_path_fnb + '/' + Gt[:po] + '/' + lng, + pot: git_path_fnb + '/' + Gt[:pot], + conf: git_path_fnb + '/' + Gt[:conf], + skin: git_path_fnb + '/' + Gt[:skin], + image: git_path_fnb + '/' + Gt[:image], + audio: git_path_fnb + '/' + Gt[:audio], + video: git_path_fnb + '/' + Gt[:video], + conf: git_path_fnb + '/' + Gt[:conf] } SiSU_DAL::Source.new(@opt).read # -m end @@ -185,9 +185,9 @@ module SiSU_Git and @opt.cmd.inspect !~/m/ ##SiSU_Assemble::Composite.new(@opt).read #SiSU_DAL::Source.new(@opt).read # -m - "#{@env.path.composite_file}/#{@opt.fnb}.ssm.sst" + "#{@env.processing_path.composite_file}/#{@opt.fnb}.ssm.sst" elsif composite_src - "#{@env.path.composite_file}/#{@opt.fnb}.ssm.sst" + "#{@env.processing_path.composite_file}/#{@opt.fnb}.ssm.sst" else "#{@env.path.pwd}/#{@opt.fns}" end end @@ -239,7 +239,7 @@ module SiSU_Git if FileTest.file?(skin) cp_r(skin,"#{@git_path[:conf]}/skin") end - {:skin =>skin, :images =>images} + { skin: skin, images: images } end def sisuyaml_rc sisurc=@env.path.sisurc_path |