diff options
Diffstat (limited to 'lib/sisu/v3/sysenv.rb')
| -rw-r--r-- | lib/sisu/v3/sysenv.rb | 40 |
1 files changed, 29 insertions, 11 deletions
diff --git a/lib/sisu/v3/sysenv.rb b/lib/sisu/v3/sysenv.rb index 442795c9..0439955b 100644 --- a/lib/sisu/v3/sysenv.rb +++ b/lib/sisu/v3/sysenv.rb @@ -101,7 +101,7 @@ module SiSU_Env data=Config::CONFIG['datadir'] + '/doc/sisu' m=/.+\/(?:src\/)?(\S+)/m # m=/.+?\/(?:src\/)?([^\/]+)$/im # m=/.+\/(\S+)/m @stub_pwd ||=@@pwd[m,1] - prcss_dir='_sisu_processing_' + prcss_dir='_sisu_processing_' + '.' + SiSU_version_dir prcss_dir_tmp_root="/tmp/#{prcss_dir}" prcss_dir_stub="#{prcss_dir}/#{@stub_pwd}" if @@user @@ -2018,16 +2018,19 @@ WOK @rc['processing']['dir'] else defaults[:processing_dir] end + v=SiSU_Env::InfoVersion.instance.get_version + v_dev=(DEVELOPER[:maintenance]==:true) \ + ? "_#{v[:version]}" + : '' path=if proposed_path_base \ and FileTest.directory?(proposed_path_base) \ and File.writable?("#{proposed_path_base}/.") - x=if proposed_dir - "#{proposed_path_base}/#{proposed_dir}" - else - "#{proposed_path_base}/#{defaults[:processing_dir]}" - end + x=proposed_dir \ + ? "#{proposed_path_base}/#{proposed_dir}" + : "#{proposed_path_base}/#{defaults[:processing_dir]}" else defaults[:processing_dir_tmp_root] end + path = path + v_dev end def usr_dir? case root_dir @@ -3439,7 +3442,10 @@ WOK @env=SiSU_Env::InfoEnv.new(@fns) m=/((.+?)(?:\~\w\w(?:_\w\w)?)?)\.((?:-|ssm\.)?sst|ssm)$/ #watch added match for sss @fnn,@fnb,@fnt=@fns[m,1],@fns[m,2],@fns[m,3] - rescue; STDERR.puts SiSU_Screen::Ansi.new(@fns,$!,$@).rescue + rescue + SiSU_Screen::Ansi.new('',$!,$@).rescue do + __LINE__.to_s + ':' + __FILE__ + end ensure end end @@ -3902,7 +3908,10 @@ WOK def initialize(md) begin @md=md - rescue; STDERR.puts SiSU_Screen::Ansi.new(@cmd,$!,$@).rescue + rescue + SiSU_Screen::Ansi.new(md.opt.cmd,$!,$@).rescue do + __LINE__.to_s + ':' + __FILE__ + end ensure end end @@ -3930,7 +3939,10 @@ WOK begin @md,@fno=md,fno @env=SiSU_Env::InfoEnv.new(@md.fns) - rescue; STDERR.puts SiSU_Screen::Ansi.new(@cmd,$!,$@).rescue + rescue + SiSU_Screen::Ansi.new(md.opt.cmd,$!,$@).rescue do + __LINE__.to_s + ':' + __FILE__ + end ensure end end @@ -5395,7 +5407,10 @@ WOK begin super(fns) @env=SiSU_Env::InfoEnv.new(fns) - rescue; STDERR.puts SiSU_Screen::Ansi.new(@fns,$!,$@).rescue + rescue + SiSU_Screen::Ansi.new('',$!,$@).rescue do + __LINE__.to_s + ':' + __FILE__ + end ensure end end @@ -5496,7 +5511,10 @@ WOK @env_pdf="#{@env_out_root}/pdf" end end - rescue; STDERR.puts SiSU_Screen::Ansi.new(@cmd,$!,$@).rescue + rescue + SiSU_Screen::Ansi.new(@cmd,$!,$@).rescue do + __LINE__.to_s + ':' + __FILE__ + end ensure end end |