lib/coderunner/run.rb in coderunner-0.12.5 vs lib/coderunner/run.rb in coderunner-0.12.6
- old
+ new
@@ -408,11 +408,11 @@
# Return the folder where the default defaults file is located.
def defaults_location
if @runner.defaults_file
- location = [ENV['HOME'] + "/.coderunner/#{@code}crmod/defaults_files", rcp.code_module_folder + "/defaults_files"].find{|folder| FileTest.exist? folder and Dir.entries(folder).include? defaults_file_name}
+ location = [rcp.user_defaults_location, rcp.code_module_folder + "/defaults_files"].find{|folder| FileTest.exist? folder and Dir.entries(folder).include? defaults_file_name}
raise "Defaults file: #{defaults_file_name} not found" unless location
return location
else
return "#{SCRIPT_FOLDER}/code_modules/#@code"
end
@@ -784,9 +784,10 @@
# ep @run_info
@run_info = rcp.run_info + ([:job_no, :running, :id, :status, :sys, :is_phantom, :naming_pars, :run_name, :resubmit_id, :real_id, :phantom_runs, :parameter_hash, :output_file, :error_file] + SUBMIT_OPTIONS) #.each{|v| RUN_INFO.push v} unless RUN_INFO.include? :job_no
@all = (rcp.variables + rcp.results + rcp.run_info) #.each{|v| ALL.push v}
# ep "GOT HERE"
(@all + [:directory, :run_name, :modlet, :relative_directory]).each{|var| send(:attr_accessor, var)}
+ @user_defaults_location = ENV['HOME'] + "/.coderunner/#{@code}crmod/defaults_files"
define_method(:output_file) do
return @output_file if @output_file
@output_file = super()
end
define_method(:error_file) do