From b6fd302a837f7de0fe58bba1b62f974f6ee4efc2 Mon Sep 17 00:00:00 2001 From: Roxanne Skelly Date: Wed, 26 Sep 2018 18:40:54 -0700 Subject: [PATCH] OSX Interface-running detection fixes --- server-console/src/modules/hf-app.js | 6 +++++- server-console/src/modules/hf-process.js | 3 +-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/server-console/src/modules/hf-app.js b/server-console/src/modules/hf-app.js index 1b1171baef..d7c54d3e4d 100644 --- a/server-console/src/modules/hf-app.js +++ b/server-console/src/modules/hf-app.js @@ -67,7 +67,11 @@ exports.startInterface = function(url) { } exports.isInterfaceRunning = function(done) { - var pInterface = new Process('interface', 'interface.exe'); + if (osType == 'Windows_NT') { + var pInterface = new Process('interface', 'interface.exe'); + } else if (osType == 'Darwin') { + var pInterface = new Process('interface', 'Interface'); + } return pInterface.isRunning(done); } diff --git a/server-console/src/modules/hf-process.js b/server-console/src/modules/hf-process.js index 35da07af9c..7736de0e55 100644 --- a/server-console/src/modules/hf-process.js +++ b/server-console/src/modules/hf-process.js @@ -274,8 +274,7 @@ Process.prototype = extend(Process.prototype, { done(running); }); } else if (os.type == 'Darwin') { - console.log("TODO IsRunning Darwin"); - childProcess.exec('ps cax | grep interface', function (err, stdout, stderr) { + childProcess.exec('ps cax | grep ' + _command, function (err, stdout, stderr) { done(stdout.length > 0); }); }