From d9a76770d5393e9a52f6de74336e412a785ed29f Mon Sep 17 00:00:00 2001 From: pbca26 Date: Thu, 7 Sep 2017 14:03:32 +0300 Subject: [PATCH] revert back osx komodo.conf name change --- routes/shepherd.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/routes/shepherd.js b/routes/shepherd.js index 72fc088..30743be 100644 --- a/routes/shepherd.js +++ b/routes/shepherd.js @@ -1569,7 +1569,7 @@ shepherd.quitKomodod = function(timeout = 100) { } shepherd.getConf = function(chain) { - const _confLocation = chain === 'komodod' ? (os.platform() === 'darwin' ? `${komodoDir}/Komodo.conf` : `${komodoDir}/komodo.conf`) : `${komodoDir}/${chain}/${chain}.conf`; + const _confLocation = chain === 'komodod' ? `${komodoDir}/komodo.conf` : `${komodoDir}/${chain}/${chain}.conf`; // komodoDir if (fs.existsSync(_confLocation)) { @@ -2902,7 +2902,7 @@ shepherd.setConfKMD = function() { } // check if kmd conf exists - _fs.access(os.platform() === 'darwin' ? `${komodoDir}/Komodo.conf` : `${komodoDir}/komodo.conf`, fs.constants.R_OK, function(err) { + _fs.access(`${komodoDir}/komodo.conf`, fs.constants.R_OK, function(err) { if (err) { console.log('creating komodo conf'); shepherd.writeLog(`creating komodo conf in ${komodoDir}/komodo.conf`); @@ -2939,7 +2939,7 @@ function setConf(flock) { let DaemonConfPath; switch (flock) { case 'komodod': - DaemonConfPath = os.platform() === 'darwin' ? `${komodoDir}/Komodo.conf` : `${komodoDir}/komodo.conf`; + DaemonConfPath = `${komodoDir}/komodo.conf`; if (os.platform() === 'win32') { DaemonConfPath = path.normalize(DaemonConfPath);