v4 v5: sysenv for texpdf, fix for when tex to pdf generator is absentsisu_4.2.20

4 files changed, 12 insertions, 10 deletions

diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4
index e56a80f8..c3a3cf80 100644
--- a/data/doc/sisu/CHANGELOG_v4
+++ b/data/doc/sisu/CHANGELOG_v4
@@ -37,6 +37,8 @@ introducing v6 for development, proposed for this release + 1]
 
 * bin/sisu & some related lib changes
 
+* sysenv for texpdf, fix for when tex to pdf generator is absent
+
 %% 4.2.19.orig.tar.xz (2014-01-17:02/5)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.19
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.2.19-1
diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5
index 59e1e54d..5eff6d0c 100644
--- a/data/doc/sisu/CHANGELOG_v5
+++ b/data/doc/sisu/CHANGELOG_v5
@@ -41,6 +41,8 @@ introducing v6 for development, proposed for this release + 1]
 
 * bin/sisu & some related lib changes
 
+* sysenv for texpdf, fix for when tex to pdf generator is absent
+
 %% 5.2.2.orig.tar.xz (2014-01-17:02/5)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.2.2
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.2.2-1
diff --git a/lib/sisu/v4/sysenv.rb b/lib/sisu/v4/sysenv.rb
index bcd7c09d..eda1ad46 100644
--- a/lib/sisu/v4/sysenv.rb
+++ b/lib/sisu/v4/sysenv.rb
@@ -822,11 +822,11 @@ module SiSU_Env
       : (STDERR.puts "\t*WARN* #{program} is not installed #{program_ref}")
     end
     def tex2pdf_engine
-      prog=['xetex','xelatex','pdflatex','pdfetex','pdftex']
+      progs=['xetex','xelatex','pdflatex','pdfetex','pdftex']
       @pdfetex_flag=false
       @cmd ||=''
       @texpdf=nil
-      prog.each do |program|
+      progs.each do |program|
         if program_found?(program)
           @texpdf=program if program =~/xetex|xelatex|pdftex|pdflatex/
           @pdfetex_flag=true
@@ -834,7 +834,7 @@ module SiSU_Env
         end
       end
       if @pdfetex_flag==false
-        @texpdf=prog.join(', ')
+        @texpdf=progs.join(', ')
       end
       @texpdf
     end
@@ -846,7 +846,6 @@ module SiSU_Env
       else %q{2>&1 | grep -v '$'}
       end
       mode='batchmode' #mode='nonstopmode'
-      program_ref="\n\t\tSee http://www.tug.org/applications/pdftex/\n\t\tOn Debian this is is included in tetex-extra"
       texpdf=tex2pdf_engine
       if @pdfetex_flag
         texpdf_cmd=case texpdf
@@ -860,7 +859,7 @@ module SiSU_Env
           "#{texpdf} -interaction=#{mode} #{@input} #{tell}\n"
         end
         system(texpdf_cmd)
-      else STDERR.puts "\t*WARN* none of the following programs are installed: #{program[0]}, #{program[1]}, #{program[2]} is installed. #{program_ref}"
+      else STDERR.puts "\t*WARN* none of the following programs are installed: #{@texpdf}"
       end
     end
     def makeinfo                                                               #texinfo
diff --git a/lib/sisu/v5/sysenv.rb b/lib/sisu/v5/sysenv.rb
index aad87231..a8fcbd7a 100644
--- a/lib/sisu/v5/sysenv.rb
+++ b/lib/sisu/v5/sysenv.rb
@@ -823,11 +823,11 @@ module SiSU_Env
       : (STDERR.puts "\t*WARN* #{program} is not installed #{program_ref}")
     end
     def tex2pdf_engine
-      prog=['xetex','xelatex','pdflatex','pdfetex','pdftex']
+      progs=['xetex','xelatex','pdflatex','pdfetex','pdftex']
       @pdfetex_flag=false
       @cmd ||=''
       @texpdf=nil
-      prog.each do |program|
+      progs.each do |program|
         if program_found?(program)
           @texpdf=program if program =~/xetex|xelatex|pdftex|pdflatex/
           @pdfetex_flag=true
@@ -835,7 +835,7 @@ module SiSU_Env
         end
       end
       if @pdfetex_flag==false
-        @texpdf=prog.join(', ')
+        @texpdf=progs.join(', ')
       end
       @texpdf
     end
@@ -847,7 +847,6 @@ module SiSU_Env
       else %q{2>&1 | grep -v '$'}
       end
       mode='batchmode' #mode='nonstopmode'
-      program_ref="\n\t\tSee http://www.tug.org/applications/pdftex/\n\t\tOn Debian this is is included in tetex-extra"
       texpdf=tex2pdf_engine
       if @pdfetex_flag
         texpdf_cmd=case texpdf
@@ -861,7 +860,7 @@ module SiSU_Env
           "#{texpdf} -interaction=#{mode} #{@input} #{tell}\n"
         end
         system(texpdf_cmd)
-      else STDERR.puts "\t*WARN* none of the following programs are installed: #{program[0]}, #{program[1]}, #{program[2]} is installed. #{program_ref}"
+      else STDERR.puts "\t*WARN* none of the following programs are installed: #{@texpdf}"
       end
     end
     def makeinfo                                                               #texinfo