Move and rename `server/server.js` to `server/helpers/launcher.js`

diff --git a/kiwi b/kiwi
index 4ea6594ca392a426c1f644f9ed256b95d5282f6f..3ac269e08ad3c935ac0718782c470fded569cb7f 100755 (executable)
--- 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 118b58ebb719389a03f5f4650b7d0cc707079cbc..ea3996b9a59d05c7856283fceff3345b97222227 100755 (executable)
--- a/kiwi.bat
+++ b/kiwi.bat
@@ -1,2 +1,2 @@
 @echo off\r
-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 3ab1076a0c918213c882287ea74c83eb0b606da4..b4d8ec387e012aea533eb0a4d601b35275337b8b 100644 (file)
--- a/server/server.js
+++ b/server/helpers/launcher.js
@@ -1,5 +1,5 @@
-var kiwi_app = './kiwi.js';\r
-var pidfile = '../kiwiirc.pid';\r
+var kiwi_app = '../kiwi.js';\r
+var pidfile = '../../kiwiirc.pid';\r
 var pidfile_arg;\r
 \r
 // Check if a pidfile has been set as an argument\r
@@ -9,7 +9,7 @@ if (process.argv.indexOf('-p') > -1) {
     if (pidfile_arg) {\r
         // Don't set the relative path if we have an absolute path given to us\r
         if (['/', '\\', '.'].indexOf(pidfile_arg[0]) === -1) {\r
-            pidfile = '../' + pidfile_arg;\r
+            pidfile = '../../' + pidfile_arg;\r
         } else {\r
             pidfile = pidfile_arg;\r
         }\r
@@ -61,7 +61,7 @@ switch (process.argv[2]) {
         break;\r
 \r
     case 'build':\r
-        require('./helpers/build.js');\r
+        require('./build.js');\r
         break;\r
 \r
     default:\r