From 1a8989361ed6d994d94c9ea221f5bc6e9977cece Mon Sep 17 00:00:00 2001
From: Iuri Matias <iuri.matias@gmail.com>
Date: Wed, 4 Jul 2018 16:10:12 +0300
Subject: [PATCH 1/3] ignore stderr since geth outputs normal logs to it

---
 lib/cmds/blockchain/blockchain.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/cmds/blockchain/blockchain.js b/lib/cmds/blockchain/blockchain.js
index 7d4d244a5..bc0c19ca3 100644
--- a/lib/cmds/blockchain/blockchain.js
+++ b/lib/cmds/blockchain/blockchain.js
@@ -222,7 +222,7 @@ Blockchain.prototype.checkPathLength = function() {
 Blockchain.prototype.isClientInstalled = function(callback) {
   let versionCmd = this.client.determineVersionCommand();
   this.runCommand(versionCmd, {}, (err, stdout, stderr) => {
-    if (err || stderr || !stdout || stdout.indexOf("not found") >= 0) {
+    if (err || !stdout || stdout.indexOf("not found") >= 0) {
       return callback('Geth not found');
     }
     callback();

From ace329ec6ee3b3c616aab9776c3068766ee87899 Mon Sep 17 00:00:00 2001
From: Iuri Matias <iuri.matias@gmail.com>
Date: Wed, 4 Jul 2018 16:36:49 +0300
Subject: [PATCH 2/3] make linter happy

---
 lib/cmds/blockchain/blockchain.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/cmds/blockchain/blockchain.js b/lib/cmds/blockchain/blockchain.js
index bc0c19ca3..876357d61 100644
--- a/lib/cmds/blockchain/blockchain.js
+++ b/lib/cmds/blockchain/blockchain.js
@@ -221,7 +221,7 @@ Blockchain.prototype.checkPathLength = function() {
 
 Blockchain.prototype.isClientInstalled = function(callback) {
   let versionCmd = this.client.determineVersionCommand();
-  this.runCommand(versionCmd, {}, (err, stdout, stderr) => {
+  this.runCommand(versionCmd, {}, (err, stdout, _stderr) => {
     if (err || !stdout || stdout.indexOf("not found") >= 0) {
       return callback('Geth not found');
     }

From 0f6ea45f33c6261265f30711e966c0d3cbd62cb1 Mon Sep 17 00:00:00 2001
From: Iuri Matias <iuri.matias@gmail.com>
Date: Wed, 4 Jul 2018 16:40:46 +0300
Subject: [PATCH 3/3] check for cmd not found in stderr

---
 lib/cmds/blockchain/blockchain.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/cmds/blockchain/blockchain.js b/lib/cmds/blockchain/blockchain.js
index 876357d61..a9aa2bb8f 100644
--- a/lib/cmds/blockchain/blockchain.js
+++ b/lib/cmds/blockchain/blockchain.js
@@ -221,8 +221,8 @@ Blockchain.prototype.checkPathLength = function() {
 
 Blockchain.prototype.isClientInstalled = function(callback) {
   let versionCmd = this.client.determineVersionCommand();
-  this.runCommand(versionCmd, {}, (err, stdout, _stderr) => {
-    if (err || !stdout || stdout.indexOf("not found") >= 0) {
+  this.runCommand(versionCmd, {}, (err, stdout, stderr) => {
+    if (err || !stdout || stderr.indexOf("not found") >= 0 || stdout.indexOf("not found") >= 0) {
       return callback('Geth not found');
     }
     callback();