From 344270faca3b8179c5d45e0abede70df841635c7 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Sat, 24 Sep 2011 07:45:01 -0400
Subject: v3: info files, fix output; remote, include info file & manpage (when
 selected)

---
 lib/sisu/v3/texinfo.rb | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

(limited to 'lib/sisu/v3/texinfo.rb')

diff --git a/lib/sisu/v3/texinfo.rb b/lib/sisu/v3/texinfo.rb
index ab1b7c98..f0331513 100644
--- a/lib/sisu/v3/texinfo.rb
+++ b/lib/sisu/v3/texinfo.rb
@@ -98,7 +98,7 @@ module SiSU_TexInfo
     def song
       begin
         tool=(@opt.cmd =~/[MVv]/) \
-        ?  "#{@env.program.texinfo} #{@md.file.output_path.texinfo.dir}/#{@md.file.base_filename.texinfo}"
+        ?  "#{@env.program.texinfo} #{@md.file.output_path.texinfo.dir}/#{@md.file.base_filename.info}"
         : "[#{@opt.f_pth[:lng_is]}] #{@opt.fns}"
         tell=@opt.cmd=~/[MVvz]/ \
         && @opt.cmd !~/q/ \
@@ -133,6 +133,7 @@ module SiSU_TexInfo
       @md,@data=md,data
       @env=SiSU_Env::Info_env.new(@md.fns)
       @vz=SiSU_Env::Get_init.instance.skin
+      @f=SiSU_Env::SiSU_file.new(@md)
     end
     def songsheet
       begin
@@ -142,6 +143,7 @@ module SiSU_TexInfo
         @data=tail
         output
         makeinfo #KEEP reinstate when fixed #%
+        place_info
       rescue; STDERR.puts SiSU_Screen::Ansi.new(@md.opt.cmd,$!,$@).rescue
       ensure
       end
@@ -363,19 +365,15 @@ module SiSU_TexInfo
     def output
       data=@data
       data.compact!
-      filename=%{#{@env.processing_path.texi}/#{@md.fnb}.texinfo}
-      filename_texinfo=File.new(filename,'w+')
-      puts filename if @md.opt.cmd =~/M/
-      data.each {|s| (filename_texinfo.puts s,"\n") if s}
-      filename_texinfo.close
-      file_info_src=%{#{@env.processing_path.texi}/#{@md.fnb}.info}
-      file_info="#{@md.file.output_path.texinfo.dir}/#{@md.file.base_filename.texinfo}"
-      SiSU_Env::SiSU_file.new(@md).mkdir
-      system("cp #{file_info_src} #{file_info}")
+      filename_texinfo=%{#{@env.processing_path.texi}/#{@md.fnb}.texinfo}
+      file_texinfo=File.new(filename_texinfo,'w+')
+      puts filename_texinfo if @md.opt.cmd =~/M/
+      data.each {|s| (file_texinfo.puts s,"\n") if s}
+      file_texinfo.close
     end
     def makeinfo
       if @md.fns =~/\.(?:-|ssm\.)?sst$/
-        m=/(.+?)\.([_-]?sst)$/.match(@md.fns)
+        m=/(.+?)\.((?:-|ssm\.)?sst)$/.match(@md.fns)
         fnb,sfx=m[1],m[2]
         pwd=Dir.pwd
         case sfx
@@ -387,6 +385,13 @@ module SiSU_TexInfo
         end
         Dir.chdir(pwd)
       end
+      def place_info
+        unless FileTest.directory?(@f.output_path.texinfo.dir)
+          mkdir_p(@f.output_path.texinfo.dir)
+        end
+        info_src=%{#{@env.processing_path.texi}/#{@md.fnb}.info}
+        system("cp #{info_src} #{@f.place_file.info.dir}")
+      end
     end
   end
 end
-- 
cgit v1.2.3