diff options
| author | Ralph Amissah <ralph@amissah.com> | 2010-02-08 21:42:01 -0500 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2010-02-08 21:42:01 -0500 |
| commit | ef3f1f5f7f0644b50e01af834761ebd06bb8c9e8 (patch) | |
| tree | cf5d9b6d0b83651c8d7826b63b27c0c47cf84068 /lib/sisu/v1/sysenv.rb | |
| parent | debian/data/doc/sisu/v1/sisu_markup_samples/samples, renaming of dfsg sub-dir (diff) | |
| parent | version, changelog, readme, touches (diff) | |
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'lib/sisu/v1/sysenv.rb')
| -rw-r--r-- | lib/sisu/v1/sysenv.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/sisu/v1/sysenv.rb b/lib/sisu/v1/sysenv.rb index 1adb3509..e542e680 100644 --- a/lib/sisu/v1/sysenv.rb +++ b/lib/sisu/v1/sysenv.rb @@ -213,7 +213,7 @@ module SiSU_Env stub_pwd=@@pwd[m,1] @@rc_path=["#@@pwd/_sisu","#@@home/.sisu","#@@sisu_etc/#{SiSU_version_dir}"] @@yamlrc_path=unless stub_pwd =~/^sisupod$/ - ["#@@pwd/_sisu","#@@home/.sisu","#@@sisu_etc/#{SiSU_version_dir}"] + ["#{@@pwd}/_sisu/#{SiSU_version_dir}","#{@@pwd}/_sisu","#@@home/.sisu/#{SiSU_version_dir}","#@@home/.sisu","#@@sisu_etc/#{SiSU_version_dir}"] else #security policy: prevent reading of sisurc.yml in sisupod ["#@@home/.sisu","#@@sisu_etc/#{SiSU_version_dir}"] end @@ -675,6 +675,9 @@ module SiSU_Env break end end + if @pdfetex_flag==false + @texpdf=prog.join(', ') + end @texpdf end def latex2pdf(md,papersize='a4') #convert from latex to pdf @@ -701,7 +704,7 @@ module SiSU_Env when /pdflatex/; "#{texpdf} -interaction=#{mode} #@input #{tell}\n" end system(texpdf_cmd) - else puts "\tWARN: none of the following programs are installed: #{program[0]}, #{program[1]}, #{program[2]} is installed. #{program_ref}" + else puts "\tWARN: none of the following programs appear to be installed: #{texpdf}. #{program_ref}" end end def makeinfo #texinfo |