diff --git a/gui/EasyDEX-GUI b/gui/EasyDEX-GUI index e94f978..f9fa880 160000 --- a/gui/EasyDEX-GUI +++ b/gui/EasyDEX-GUI @@ -1 +1 @@ -Subproject commit e94f97853cac23d16a0b5d9be31bf7fbfaa618c3 +Subproject commit f9fa880e22966da80563306770392045e8eb5699 diff --git a/main.js b/main.js index aaeeb12..aefe26f 100644 --- a/main.js +++ b/main.js @@ -40,10 +40,10 @@ var shepherd = require('./routes/shepherd'), if (appConfig.killIguanaOnStart) { var iguanaGrep; if (os.platform() === 'darwin') { - iguanaGrep = "ps -p $(ps -A | grep -m1 iguana | awk '{print $1}')"; + iguanaGrep = "ps -p $(ps -A | grep -m1 iguana | awk '{print $1}') | grep -i iguana"; } if (os.platform() === 'linux') { - iguanaGrep = 'ps -p $(pidof iguana)'; + iguanaGrep = 'ps -p $(pidof iguana) | grep -i iguana'; } if (os.platform() === 'win32') { iguanaGrep = 'tasklist'; @@ -51,7 +51,7 @@ if (appConfig.killIguanaOnStart) { exec(iguanaGrep, function(error, stdout, stderr) { if (stdout.indexOf('iguana') > -1) { console.log('found another iguana process(es)'); - var pkillCmd = os.platform() === 'win32' ? 'taskkill /f /im iguana.exe' : 'pkill iguana'; + var pkillCmd = os.platform() === 'win32' ? 'taskkill /f /im iguana.exe' : 'pkill -9 iguana'; exec(pkillCmd, function(error, stdout, stderr) { console.log(pkillCmd + ' is issued'); diff --git a/routes/shepherd.js b/routes/shepherd.js index 91748a1..beaad64 100644 --- a/routes/shepherd.js +++ b/routes/shepherd.js @@ -80,7 +80,7 @@ shepherd.appConfig = { "iguanaGuiOnly": false, "manualIguanaStart": false, "skipBasiliskNetworkCheck": false, - "minNotaries": 50, + "minNotaries": 8, "host": "127.0.0.1", "iguanaAppPort": 17777, "iguanaCorePort": 7778, @@ -88,7 +88,7 @@ shepherd.appConfig = { "darwin": 90000, "linux": 1000000 }, - "killIguanaOnStart": false, + "killIguanaOnStart": true, "dev": false };