From e957a85f6176350dfb170bfb224d63054e83f913 Mon Sep 17 00:00:00 2001 From: Gino van Spil Date: Sun, 3 Mar 2019 14:36:44 +0100 Subject: [PATCH 1/2] Added stracker linux compatibility --- server.js | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/server.js b/server.js index c7c3d10..037f364 100644 --- a/server.js +++ b/server.js @@ -961,9 +961,12 @@ app.get('/api/strackerserver/status', function (req, res) { // post start stracker server app.post('/api/strackerserver', function (req, res) { try { - var sTracker = childProcess.spawn('stracker.exe', ['--stracker_ini', 'stracker.ini'], { cwd: sTrackerPath }); + if(isRunningOnWindows){ + var sTracker = childProcess.spawn('stracker.exe', ['--stracker_ini', 'stracker.ini'], { cwd: sTrackerPath }); + } else { + var sTracker = childProcess.spawn('./stracker_linux_x86/stracker', ['--stracker_ini', 'stracker.ini'], { cwd: sTrackerPath });^M + } sTrackerServerPid = sTracker.pid; - if (sTrackerServerStatus == 0) { sTrackerServerStatus = -1; } @@ -995,7 +998,11 @@ app.post('/api/strackerserver', function (req, res) { app.post('/api/strackerserver/stop', function (req, res) { try { if (sTrackerServerPid) { - childProcess.spawn("taskkill", ["/pid", sTrackerServerPid, '/f', '/t']); + if (isRunningOnWindows){ + childProcess.spawn("taskkill", ["/pid", sTrackerServerPid, '/f', '/t']); + } else { + childProcess.spawn("kill", [sTrackerServerPid]); + } sTrackerServerPid = undefined; } From 0b90805fc04f2b9a95131a645245b0367316f830 Mon Sep 17 00:00:00 2001 From: Gino van Spil Date: Sun, 3 Mar 2019 15:59:36 +0100 Subject: [PATCH 2/2] Fixed line ending error --- server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server.js b/server.js index 037f364..242a860 100644 --- a/server.js +++ b/server.js @@ -964,7 +964,7 @@ app.post('/api/strackerserver', function (req, res) { if(isRunningOnWindows){ var sTracker = childProcess.spawn('stracker.exe', ['--stracker_ini', 'stracker.ini'], { cwd: sTrackerPath }); } else { - var sTracker = childProcess.spawn('./stracker_linux_x86/stracker', ['--stracker_ini', 'stracker.ini'], { cwd: sTrackerPath });^M + var sTracker = childProcess.spawn('./stracker_linux_x86/stracker', ['--stracker_ini', 'stracker.ini'], { cwd: sTrackerPath }); } sTrackerServerPid = sTracker.pid; if (sTrackerServerStatus == 0) {