public
Description: Merb More: The Full Stack. Take what you need; leave what you don't.
Homepage: http://www.merbivore.com
Clone URL: git://github.com/wycats/merb-more.git
Fix frozen-merb (remove debugging...it's so late)
ivey (author)
Wed Feb 13 00:48:55 -0800 2008
commit  999d60d327bbf8382bc2ff54fbbff1b52f014364
tree    a3adb86191d24be9006d80b199ba11efd9b207c5
parent  90c74fbf6b64892e812442f8c96079b7b8fc56e4
...
1
2
3
 
4
5
6
...
22
23
24
25
26
 
 
27
28
29
30
31
 
 
32
33
34
35
36
37
38
 
...
1
2
 
3
4
5
6
...
22
23
24
 
 
25
26
27
28
29
 
 
30
31
32
33
34
35
36
 
37
38
0
@@ -1,6 +1,6 @@
0
 #!/usr/bin/env ruby
0
 
0
-__DIR__ = File.dirname(__FILE__)
0
+__DIR__ = File.join(File.dirname(__FILE__),"..")
0
 
0
 framework = File.join(__DIR__,"framework")
0
 
0
@@ -22,16 +22,16 @@ if File.directory?(framework)
0
       $:.push File.join(plugins,d,'lib')
0
     end
0
   end
0
- p "merb-core/core_ext/kernel"
0
- p "merb-core/core_ext/rubygems"
0
+ require "merb-core/core_ext/kernel"
0
+ require "merb-core/core_ext/rubygems"
0
 else
0
   gem = Dir.glob(__DIR__ + "/gems/gems/merb-core-*").last
0
   raise "Can't run frozen without framework/ or loca gem" unless gem
0
- p gem + "/lib/core_ext/kernel"
0
- p gem + "/lib/core_ext/rubygems"
0
+ require gem + "/lib/core_ext/kernel"
0
+ require gem + "/lib/core_ext/rubygems"
0
 end
0
 
0
 
0
 require 'merb-core'
0
 Merb.frozen!
0
-Merb.start
0
\ No newline at end of file
0
+Merb.start

Comments

    No one has commented yet.