lib/rbbt/util/R.rb in rbbt-util-5.5.2 vs lib/rbbt/util/R.rb in rbbt-util-5.5.3

@@ -1,11 +1,11 @@
 require 'rbbt/util/cmd'
 require 'rbbt/tsv'
 
 module R
 
-  LIB_DIR = File.join(File.expand_path(File.dirname(__FILE__)),'../../../share/lib/R')
+  LIB_DIR = File.join(File.expand_path(File.dirname(__FILE__)),'../../../share/Rlib')
   UTIL    = File.join(LIB_DIR, 'util.R')
 
   def self.run(command, options = {})
     cmd =<<-EOF
 # Loading basic rbbt environment
@@ -35,16 +35,16 @@
     end
   end
 
   def self.interactive(script, options = {})
     TmpFile.with_file do |init_file|
-        Open.write(init_file) do |file|
-          file.puts "# Loading basic rbbt environment"
-          file.puts "library(utils);\n"
-          file.puts "source('#{R::UTIL}');\n"
-          file.puts 
-          file.puts script
+        Open.write(init_file) do |f|
+          f.puts "# Loading basic rbbt environment"
+          f.puts "library(utils);\n"
+          f.puts "source('#{R::UTIL}');\n"
+          f.puts 
+          f.puts script
         end
         CMD.cmd("env R_PROFILE='#{init_file}' xterm \"$RHOME/bin/R\"")
     end
   end
 
@@ -95,9 +95,10 @@
     end
   end
 
   def R_interactive(pre_script = nil)
     TmpFile.with_file do |f|
+      Log.debug{"R Script:\n" << pre_script }
       TmpFile.with_file(pre_script) do |script_file|
         Open.write(f, self.to_s)
         script = "data_file = '#{f}';\n"
         script << "script_file = '#{script_file}';\n" if pre_script
         R.interactive(script)