Changeset 1299

Show
Ignore:
Timestamp:
01/14/08 09:32:49 (9 months ago)
Author:
iv..@gweezlebur.com
Message:

script/merb in a frozen app should load boot.rb to get the frozen app dir

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lib/tasks/merb.rake

    r1268 r1299  
    22  script_filepath = Merb.root / 'script/merb' 
    33  FileUtils.rm script_filepath if File.exist? script_filepath 
    4   tmpl = "#!/usr/bin/env ruby\nrequire File.expand_path(File.dirname(__FILE__)+'/../framework/merb/server')\nMerb::Server.run\n" 
     4  tmpl = "#!/usr/bin/env ruby\nrequire File.expand_path(File.dirname(__FILE__)+'/../config/merb/boot')\nrequire File.expand_path(File.dirname(__FILE__)+'/../framework/merb/server')\nMerb::Server.run\n" 
    55  File.open(script_filepath, 'wb') {|f| 
    66    f.write tmpl