From 3e4154de8245a66847e0fe2f336f33b589cce9d2 Mon Sep 17 00:00:00 2001
From: Alexey Verkhovsky <averkhov@thoughtworks.com>
Date: Wed, 26 Jan 2005 01:02:39 +0000
Subject: [PATCH] fixed a problem where Instiki wouldn't start because require
 'application' was before require 'webrick_server' (?)

---
 script/server | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/script/server b/script/server
index de19debb..71cd6805 100755
--- a/script/server
+++ b/script/server
@@ -65,14 +65,17 @@ ENV['RAILS_ENV'] = OPTIONS[:environment]
 INSTIKI_DEBUG_LOG = OPTIONS[:verbose]
 require File.expand_path(File.dirname(__FILE__) + '/../config/environment')
 WikiService.storage_path = storage_path
-require 'application'
 
-unless defined? INSTIKI_BATCH_JOB
+if  defined? INSTIKI_BATCH_JOB
+  require 'application'
+else
   puts "=> Starting Instiki on http://#{OPTIONS[:ip]}:#{OPTIONS[:port]}"
   puts "=> Data files are stored in #{storage_path}"
 
-  OPTIONS[:index_controller] = 'wiki'
   require 'webrick_server'
+  require 'application'
+
+  OPTIONS[:index_controller] = 'wiki'
   ApplicationController.wiki = WikiService.instance
   DispatchServlet.dispatch(OPTIONS)
 end