From 39bf7a712e5954ca32b2de7b771e2f97660cb87e Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Thu, 11 Oct 2007 18:13:30 +0100 Subject: sisupod_make, composite file is an exception --- lib/sisu/v0/sisupod_make.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/sisu/v0/sisupod_make.rb b/lib/sisu/v0/sisupod_make.rb index 4f3bf569..8e6932f0 100644 --- a/lib/sisu/v0/sisupod_make.rb +++ b/lib/sisu/v0/sisupod_make.rb @@ -157,7 +157,10 @@ module SiSU_Doc @rgx_image=/\{\s*(\S+?\.(?:png|jpg|gif))/ @rgx_skin=/^(?:@skin:|0~skin)\s+(\S+)/ @rgx_doc_import=/^%\s\s*\|(\S+?\.ss[ti])\|@\|\^\|>>ok/ - file_array=IO.readlines("#{@env.path.composite_file}/#{@opt.fnb}._sst",'') + use_file=if @opt.fns =~/(?:\.ssm|\._sst)$/; "#{@env.path.composite_file}/#{@opt.fnb}._sst" + else @opt.fns + end + file_array=IO.readlines(use_file,'') skin,images,doc_import=[],[],[] file_array.each do |f| #% work area if f !~/^%\s/ -- cgit v1.2.3