From dce0ada531dc40e6249140a8a957a639ce09f966 Mon Sep 17 00:00:00 2001
From: Jack Allnutt <jack@allnutt.eu>
Date: Mon, 24 Nov 2014 16:00:47 +0000
Subject: [PATCH] Move and rename `server/server.js` to
 `server/helpers/launcher.js`

---
 kiwi                                      | 2 +-
 kiwi.bat                                  | 2 +-
 server/{server.js => helpers/launcher.js} | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename server/{server.js => helpers/launcher.js} (87%)

diff --git a/kiwi b/kiwi
index 4ea6594..3ac269e 100755
--- a/kiwi
+++ b/kiwi
@@ -5,7 +5,7 @@ case `uname` in
     *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
 esac
 
-node $basedir/server/server.js "$@"
+node $basedir/server/helpers/launcher.js "$@"
 ret=$?
 
 exit $ret
diff --git a/kiwi.bat b/kiwi.bat
index 118b58e..ea3996b 100755
--- a/kiwi.bat
+++ b/kiwi.bat
@@ -1,2 +1,2 @@
 @echo off
-node %~dp0\server\server.js %*
\ No newline at end of file
+node %~dp0\server\helpers\launcher.js %*
\ No newline at end of file
diff --git a/server/server.js b/server/helpers/launcher.js
similarity index 87%
rename from server/server.js
rename to server/helpers/launcher.js
index 3ab1076..b4d8ec3 100644
--- a/server/server.js
+++ b/server/helpers/launcher.js
@@ -1,5 +1,5 @@
-var kiwi_app = './kiwi.js';
-var pidfile = '../kiwiirc.pid';
+var kiwi_app = '../kiwi.js';
+var pidfile = '../../kiwiirc.pid';
 var pidfile_arg;
 
 // Check if a pidfile has been set as an argument
@@ -9,7 +9,7 @@ if (process.argv.indexOf('-p') > -1) {
     if (pidfile_arg) {
         // Don't set the relative path if we have an absolute path given to us
         if (['/', '\\', '.'].indexOf(pidfile_arg[0]) === -1) {
-            pidfile = '../' + pidfile_arg;
+            pidfile = '../../' + pidfile_arg;
         } else {
             pidfile = pidfile_arg;
         }
@@ -61,7 +61,7 @@ switch (process.argv[2]) {
         break;
 
     case 'build':
-        require('./helpers/build.js');
+        require('./build.js');
         break;
 
     default:
-- 
2.25.1