Updating to fix a few lingering issues with Merb root

1 files changed, 27 insertions, 0 deletions

diff --git a/bin/chef-server b/bin/chef-server
index 8b264ec5a7..dfdb720ab7 100644..100755
--- a/bin/chef-server
+++ b/bin/chef-server
@@ -1,4 +1,29 @@
 #!/usr/bin/env ruby
+#
+# ./chef-server - Serving up piping hot infrastructure!
+#
+# Author:: Adam Jacob (<adam@hjksolutions.com>)
+# Copyright:: Copyright (c) 2008 HJK Solutions, LLC
+# License:: GNU General Public License version 2 or later
+# 
+# This program and entire repository is free software; you can
+# redistribute it and/or modify it under the terms of the GNU 
+# General Public License as published by the Free Software 
+# Foundation; either version 2 of the License, or any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+
+# Based on the 'merb' command, by Ezra
+
+require "rubygems"
 require "merb-core"
 
 if ARGV[0] && ARGV[0] =~ /^[^-]/
@@ -9,4 +34,6 @@ unless %w[-a --adapter -i --irb-console -r --script-runner].any? { |o| ARGV.inde
   ARGV.push *%w[-a mongrel]
 end
 
+ARGV.push *[ "-I", File.join(File.dirname(__FILE__), "..", "lib", "chef_server", "init.rb") ]
+
 Merb.start