Browse Source

Merge pull request #174 from SuperNETorg/bin-exec-fix

revert back osx komodo.conf name change
all-modes
pbca26 8 years ago
committed by GitHub
parent
commit
a8e5b0e8d0
  1. 6
      routes/shepherd.js

6
routes/shepherd.js

@ -1569,7 +1569,7 @@ shepherd.quitKomodod = function(timeout = 100) {
} }
shepherd.getConf = function(chain) { 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 // komodoDir
if (fs.existsSync(_confLocation)) { if (fs.existsSync(_confLocation)) {
@ -2902,7 +2902,7 @@ shepherd.setConfKMD = function() {
} }
// check if kmd conf exists // 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) { if (err) {
console.log('creating komodo conf'); console.log('creating komodo conf');
shepherd.writeLog(`creating komodo conf in ${komodoDir}/komodo.conf`); shepherd.writeLog(`creating komodo conf in ${komodoDir}/komodo.conf`);
@ -2939,7 +2939,7 @@ function setConf(flock) {
let DaemonConfPath; let DaemonConfPath;
switch (flock) { switch (flock) {
case 'komodod': case 'komodod':
DaemonConfPath = os.platform() === 'darwin' ? `${komodoDir}/Komodo.conf` : `${komodoDir}/komodo.conf`; DaemonConfPath = `${komodoDir}/komodo.conf`;
if (os.platform() === 'win32') { if (os.platform() === 'win32') {
DaemonConfPath = path.normalize(DaemonConfPath); DaemonConfPath = path.normalize(DaemonConfPath);

Loading…
Cancel
Save