From b0c715be8853dd25057861f511d672fc0d3f1bad Mon Sep 17 00:00:00 2001
From: rootzoll <christian@geektank.de>
Date: Wed, 19 Feb 2020 10:52:06 +0100
Subject: [PATCH] fix error feedback on wrong seed word

---
 home.admin/70initLND.sh                      | 2 +-
 home.admin/config.scripts/lnd.initwallet.py  | 8 ++++----
 home.admin/config.scripts/lnd.initwallet2.py | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/home.admin/70initLND.sh b/home.admin/70initLND.sh
index 7f4ae4a25..72db9a6cf 100755
--- a/home.admin/70initLND.sh
+++ b/home.admin/70initLND.sh
@@ -359,7 +359,7 @@ to protect the seed words. Most users did not set this.
 
       # trigger wallet recovery
       source /home/admin/python3-env-lnd/bin/activate
-      source <(python3 /home/admin/config.scripts/lnd.initwallet.py seed ${passwordC} "${wordstring}" ${passwordD})
+      source <(python3 /home/admin/config.scripts/lnd.initwallet.py seed ${passwordC} "${wordstring}" ${passwordD} 2>/dev/null)
 
       # check if wallet was created for real
       if [ ${#err} -eq 0 ]; then
diff --git a/home.admin/config.scripts/lnd.initwallet.py b/home.admin/config.scripts/lnd.initwallet.py
index c8eea9cc1..2fe1fbef9 100644
--- a/home.admin/config.scripts/lnd.initwallet.py
+++ b/home.admin/config.scripts/lnd.initwallet.py
@@ -57,7 +57,7 @@ def new(stub, wallet_password="", seed_entropy=None):
         print(code, file=sys.stderr)
         details = rpc_error_call.details()
         print("err='RPCError GenSeedRequest'")
-        print("errMore='" + details + "'")
+        print("errMore=\"" + details + "\"")
         sys.exit(1)
     except:
         e = sys.exc_info()[0]
@@ -76,7 +76,7 @@ def new(stub, wallet_password="", seed_entropy=None):
         print(code, file=sys.stderr)
         details = rpc_error_call.details()
         print("err='RPCError InitWallet'")
-        print("errMore='" + details + "'")
+        print("errMore=\"" + details + "\"")
         sys.exit(1)
     except:
         e = sys.exc_info()[0]
@@ -100,7 +100,7 @@ def seed(stub, wallet_password="", seed_words="", seed_password=""):
         print(code, file=sys.stderr)
         details = rpc_error_call.details()
         print("err='RPCError InitWallet'")
-        print("errMore='" + details + "'")
+        print("errMore=\"" + details + "\"")
         sys.exit(1)
     except:
         e = sys.exc_info()[0]
@@ -130,7 +130,7 @@ def scb(stub, wallet_password="", seed_words="", seed_password="", file_path_scb
         print(code, file=sys.stderr)
         details = rpc_error_call.details()
         print("err='RPCError InitWallet'")
-        print("errMore='" + details + "'")
+        print("errMore=\"" + details + "\"")
         sys.exit(1)
     except:
         e = sys.exc_info()[0]
diff --git a/home.admin/config.scripts/lnd.initwallet2.py b/home.admin/config.scripts/lnd.initwallet2.py
index a2b412a4b..cd2600400 100644
--- a/home.admin/config.scripts/lnd.initwallet2.py
+++ b/home.admin/config.scripts/lnd.initwallet2.py
@@ -56,7 +56,7 @@ def new(stub, wallet_password="", seed_entropy=None):
         print >> sys.stderr, code
         details = rpc_error_call.details()
         print("err='RPCError GenSeedRequest'")
-        print("errMore='" + details + "'")
+        print("errMore=\"" + details + "\"")
         sys.exit(1)
     except:
         e = sys.exc_info()[0]
@@ -75,7 +75,7 @@ def new(stub, wallet_password="", seed_entropy=None):
         print >> sys.stderr, code
         details = rpc_error_call.details()
         print("err='RPCError InitWallet'")
-        print("errMore='" + details + "'")
+        print("errMore=\"" + details + "\"")
         sys.exit(1)
     except:
         e = sys.exc_info()[0]
@@ -99,7 +99,7 @@ def seed(stub, wallet_password="", seed_words="", seed_password=""):
         print >> sys.stderr, code
         details = rpc_error_call.details()
         print("err='RPCError InitWallet'")
-        print("errMore='" + details + "'")
+        print("errMore=\"" + details + "\"")
         sys.exit(1)
     except:
         e = sys.exc_info()[0]
@@ -129,7 +129,7 @@ def scb(stub, wallet_password="", seed_words="", seed_password="", file_path_scb
         print >> sys.stderr, code
         details = rpc_error_call.details()
         print("err='RPCError InitWallet'")
-        print("errMore='" + details + "'")
+        print("errMore=\"" + details + "\"")
         sys.exit(1)
     except:
         e = sys.exc_info()[0]