diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sisu/v1/param.rb | 10 | ||||
| -rw-r--r-- | lib/sisu/v1/sysenv.rb | 7 |
2 files changed, 10 insertions, 7 deletions
diff --git a/lib/sisu/v1/param.rb b/lib/sisu/v1/param.rb index 72593207..889ec351 100644 --- a/lib/sisu/v1/param.rb +++ b/lib/sisu/v1/param.rb @@ -94,8 +94,8 @@ module SiSU_Param if File.exist?(@pstorefile) param_msg='Parameters from pstore' retrieve_store=PStore.new(@pstorefile) - retrieve_store.transaction do |s| - @md=s['md'] + retrieve_store.transaction do + @md=retrieve_store['md'] end @md else @@ -979,10 +979,10 @@ module SiSU_Param tell=SiSU_Screen::Ansi.new(@md.cmd,"PStore -> #@pstorefile") tell.txt_grey if @md.cmd =~/v/ store=PStore.new(@pstorefile) - store.transaction do |s| - s['md']=@md + store.transaction do + store['md']=@md #doc.each{|x,y| puts "#{x}, #{y}; "} - s.commit + store.commit end @@md=@md=nil end 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 |