From 53a4ec45a504cc19536530e37da4f79bfbd895fd Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Sat, 4 Jul 2009 08:40:03 -0400
Subject: make sisu and ruby version info ruby instance methods

---
 lib/sisu/v0/sysenv.rb | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'lib/sisu/v0/sysenv.rb')

diff --git a/lib/sisu/v0/sysenv.rb b/lib/sisu/v0/sysenv.rb
index fe1d1b62..a37905bd 100644
--- a/lib/sisu/v0/sysenv.rb
+++ b/lib/sisu/v0/sysenv.rb
@@ -517,7 +517,7 @@ module SiSU_Env
         :sxd             => filename(code,@fnb,'.sxd.xml'),
         :sxn             => filename(code,@fnb,'.sxn.xml'),
         :sisupod         => filename(nil,@fnz,''),
-        :book_idx        => filename(code,'book_index','.html'),
+        :book_idx_html   => filename(code,'book_index','.html'),
       }
       @fn
     end
@@ -546,7 +546,7 @@ module SiSU_Env
       program='file'
       fnsp=Info_env.new(filename).source_file_with_path
       if program_found?(program)
-        encoding=%x{file #{fnsp}}.strip
+        encoding=%x{file -L #{fnsp}}.strip
         encoding.gsub!(/#{fnsp}:(\s+|$)/,'')
         encoding=if encoding \
         and not encoding.empty?
@@ -1481,7 +1481,9 @@ WOK
         pth
       end
       def odf
-        "#{processing}/odf"
+        pth="#{processing}/odf"
+        mkdir_p(pth) unless FileTest.directory?(pth)
+        pth
       end
       def tex
         pth=if defined? @rc['processing']['latex'] \
@@ -2635,6 +2637,7 @@ WOK
     end
   end
   class Info_version <Info_env
+    include Singleton
     require 'rbconfig'
     def get_version
       @version={}
@@ -3035,7 +3038,7 @@ WOK
       begin
         super(fns)
         @env=SiSU_Env::Info_env.new(fns)
-        ver=Info_version.new
+        ver=Info_version.instance
         case operation #watch
         when /pdf/; @env_out=''
         when /sql/
-- 
cgit v1.2.3