fixed merge of config

fabiokung · Jun 12, 2008 · dfbea5c · dfbea5c
1 parent 724d5df
commit dfbea5c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/bin/jetty_merb b/bin/jetty_merb
@@ -20,6 +20,9 @@
 # --environment ENV, -e ENV::
 #    change rails environment (default: development)
 #
+# --config FILE:: (optional)
+#	config file to use instead of command line switches (allows for multiple servers)
+#
 # BASEDIR (optional): directory to be run (default: current).
 
 require "java"
@@ -80,7 +83,7 @@ opts.each do |opt, arg|
       config[:environment] = arg
 	when '--config'
 	  arg = "#{File.join(Dir.pwd, 'jetty_merb.yml')}"  if arg.nil? || arg == ""
-	  config.merge(YAML.load_file(arg))
+	  config.merge!(YAML.load_file(arg))
   end
 end
 

diff --git a/bin/jetty_rails b/bin/jetty_rails
@@ -20,8 +20,8 @@
 # --environment ENV, -e ENV::
 #    change rails environment (default: development)
 #
-# --config 
-#	config file to use instead of command line switches
+# --config FILE:: (optional)
+#	config file to use instead of command line switches (allows for multiple servers)
 #
 # BASEDIR (optional): directory to be run (default: current).
 
@@ -86,7 +86,7 @@ opts.each do |opt, arg|
       config[:environment] = arg
 	when '--config'
 	  arg = "#{File.join(Dir.pwd, 'config', 'jetty_rails.yml')}"  if arg.nil? || arg == ""
-	  config.merge(YAML.load_file(arg))
+	  config.merge!(YAML.load_file(arg))
   end
 end