From b38cf476612ca9dcb26924258d31ccdd97d0f5c9 Mon Sep 17 00:00:00 2001 From: Jonne Hass Date: Wed, 7 Sep 2011 03:30:43 +0200 Subject: [PATCH] rename config/script_server_config.yml to config/script_server.yml to remove redundancy --- ...t_server_config.yml.example => script_server.yml.example} | 0 script/get_config.rb | 5 +++++ script/server | 1 + 3 files changed, 6 insertions(+) rename config/{script_server_config.yml.example => script_server.yml.example} (100%) diff --git a/config/script_server_config.yml.example b/config/script_server.yml.example similarity index 100% rename from config/script_server_config.yml.example rename to config/script_server.yml.example diff --git a/script/get_config.rb b/script/get_config.rb index 8e8eee647..87a75142d 100755 --- a/script/get_config.rb +++ b/script/get_config.rb @@ -23,6 +23,11 @@ if ARGV.length >= 1 if Rails.env == 'script_server' # load from the special script_server_config.yml file require 'yaml' script_server_config_file = File.join(Rails.root, 'config', 'script_server_config.yml') + if File.exists? script_server_config_file + $stderr.puts "Deprecation warning: config/script_server_config.yml has been renamed to config/script_server.yml" + else + script_server_config_file = File.join(Rails.root, 'config', 'script_server.yml') + end begin print YAML.load_file(script_server_config_file)['script_server'][setting_name] rescue diff --git a/script/server b/script/server index bbea17b40..9bfc17b8d 100755 --- a/script/server +++ b/script/server @@ -11,6 +11,7 @@ cd $(dirname $(readlink -e $0))/.. # Check if script_server.yml exists if [ ! -e 'config/script_server.yml' ]; then + echo "INFO: config/script_server_config.yml has been renamed to config/script_server.yml" >&2 echo 'FATAL: config/script_server.yml is missing! Copy over config/script_server.yml.example to config/script_server.yml and edit it properly!' >&2 exit 69 fi -- GitLab