From 29fcf4ab543eb68ccd1ac4e29decbd7855696bd0 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sun, 15 May 2011 11:50:04 -0400 Subject: v3: sysenv, output directory structure check, fix (start testing alternatives) --- lib/sisu/v3/sysenv.rb | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) (limited to 'lib') diff --git a/lib/sisu/v3/sysenv.rb b/lib/sisu/v3/sysenv.rb index a1c6228b..c22f878c 100644 --- a/lib/sisu/v3/sysenv.rb +++ b/lib/sisu/v3/sysenv.rb @@ -405,11 +405,10 @@ module SiSU_Env x=if defined? @rc['output_dir_structure_by'] \ and @rc['output_dir_structure_by'] =~/language/ true - else defined? @rc['output_structure']['by_language'] - (defined? @rc['output_structure']['by_language'] \ - && @rc['output_structure']['by_language'] ==true) \ - ? true \ - : false + elsif defined? @rc['output_structure']['by_language'] \ + and @rc['output_structure']['by_language'] ==true + true + else false end end def by_filetype? @@ -418,11 +417,10 @@ module SiSU_Env elsif defined? @rc['output_dir_structure_by'] \ and @rc['output_dir_structure_by'] =~/filetype/ true - else - x=(defined? @rc['output_structure']['by_filetype'] \ - && @rc['output_structure']['by_filetype'] ==true) \ - ? true \ - : false + elsif defined? @rc['output_structure']['by_filetype'] \ + and @rc['output_structure']['by_filetype'] ==true + true + else false end end def by_filename? @@ -436,8 +434,7 @@ module SiSU_Env elsif defined? @rc['output_structure']['by_filename'] \ and @rc['output_structure']['by_filename'] ==true true - else - true + else true end end def multilingual? -- cgit v1.2.3