From 8c3878b326fe52170b8541b32e2a6f0210c807ec Mon Sep 17 00:00:00 2001
From: rootzoll <christian@geektank.de>
Date: Thu, 9 Aug 2018 12:04:31 +0200
Subject: [PATCH] id wallet exists unlock

---
 home.admin/70initLND.sh   | 7 ++++++-
 home.admin/AAunlockLND.sh | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/home.admin/70initLND.sh b/home.admin/70initLND.sh
index c46c192b9..15838938e 100755
--- a/home.admin/70initLND.sh
+++ b/home.admin/70initLND.sh
@@ -94,7 +94,7 @@ echo ""
 ###### Instructions on Creating LND Wallet
 walletExists=$(sudo ls /mnt/hdd/lnd/data/chain/${network}/${chain}net/wallet.db 2>/dev/null | grep wallet.db -c)
 echo "walletExists(${walletExists})"
-sleep 6
+sleep 2
 if [ ${walletExists} -eq 0 ]; then
 
   # delete old macaroons if exist
@@ -158,6 +158,11 @@ sleep 60
 echo ""
 echo "*** Copy LND Macaroons to user admin ***"
 macaroonExists=$(sudo -u bitcoin ls -la /home/bitcoin/.lnd/admin.macaroon | grep -c admin.macaroon)
+if [ ${macaroonExists} -eq 0 ]; then
+  ./AAunlock.sh
+  sleep 3
+fi
+macaroonExists=$(sudo -u bitcoin ls -la /home/bitcoin/.lnd/admin.macaroon | grep -c admin.macaroon)
 if [ ${macaroonExists} -eq 0 ]; then
   sudo -u bitcoin ls -la /home/bitcoin/.lnd/admin.macaroon
   echo ""
diff --git a/home.admin/AAunlockLND.sh b/home.admin/AAunlockLND.sh
index 98d1e881e..a9ab4ef99 100755
--- a/home.admin/AAunlockLND.sh
+++ b/home.admin/AAunlockLND.sh
@@ -12,7 +12,7 @@ echo "**************************************************************************
 while :
   do
     chain="$(${network}-cli -datadir=/home/bitcoin/.${network} getblockchaininfo | jq -r '.chain')"
-    lncli unlock
+    sudo -u bitcoin lncli unlock
     sleep 4
     locked=$(sudo tail -n 1 /mnt/hdd/lnd/logs/${network}/${chain}net/lnd.log | grep -c unlock)
     if [ ${locked} -eq 0  ]; then