From 7ac2d3ad5dba45091dbb2a3ac827345f8a41a873 Mon Sep 17 00:00:00 2001
From: openoms <oms@tuta.io>
Date: Fri, 17 Sep 2021 08:02:29 +0100
Subject: [PATCH] always set lightning instance in raspiblitz.conf

---
 home.admin/config.scripts/cln.install.sh |  5 ++++-
 home.admin/config.scripts/lnd.install.sh | 17 +++++++++++------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/home.admin/config.scripts/cln.install.sh b/home.admin/config.scripts/cln.install.sh
index a4db7509b..c5f9d03c5 100644
--- a/home.admin/config.scripts/cln.install.sh
+++ b/home.admin/config.scripts/cln.install.sh
@@ -37,11 +37,14 @@ source <(/home/admin/config.scripts/network.aliases.sh getvars cln $2)
 echo "# Running: 'cln.install.sh $*'"
 echo "# Using the settings for: ${network} ${CHAIN}"
 
+# add default value to raspi config if needed
+if ! grep -Eq "^lightning=" /mnt/hdd/raspiblitz.conf; then
+  echo "lightning=cln" | sudo tee -a /mnt/hdd/raspiblitz.conf
+fi
 # add default value to raspi config if needed
 if ! grep -Eq "^${netprefix}cln=" /mnt/hdd/raspiblitz.conf; then
   echo "${netprefix}cln=off" | sudo tee -a /mnt/hdd/raspiblitz.conf
 fi
-
 source /mnt/hdd/raspiblitz.conf
 
 if [ "$1" = on ]||[ "$1" = update ]||[ "$1" = experimental ]||[ "$1" = testPR ];then
diff --git a/home.admin/config.scripts/lnd.install.sh b/home.admin/config.scripts/lnd.install.sh
index db07a663f..0cd37a36f 100644
--- a/home.admin/config.scripts/lnd.install.sh
+++ b/home.admin/config.scripts/lnd.install.sh
@@ -38,6 +38,17 @@ elif [ ${CHAIN} = mainnet ];then
   zmqprefix=28
 fi
 
+source /home/admin/raspiblitz.info
+# add default value to raspi config if needed
+if ! grep -Eq "^lightning=" /mnt/hdd/raspiblitz.conf; then
+  echo "lightning=lnd" | sudo tee -a /mnt/hdd/raspiblitz.conf
+fi
+# add default value to raspi config if needed
+if ! grep -Eq "^${netprefix}lnd=" /mnt/hdd/raspiblitz.conf; then
+  echo "${netprefix}lnd=off" >> /mnt/hdd/raspiblitz.conf
+fi
+source /mnt/hdd/raspiblitz.conf
+
 function removeParallelService() {
   if [ -f "/etc/systemd/system/${netprefix}lnd.service" ];then
     sudo -u bitcoin /usr/local/bin/lncli\
@@ -50,12 +61,6 @@ function removeParallelService() {
   fi
 }
 
-source /home/admin/raspiblitz.info
-# add default value to raspi config if needed
-if ! grep -Eq "^${netprefix}lnd=" /mnt/hdd/raspiblitz.conf; then
-  echo "${netprefix}lnd=off" >> /mnt/hdd/raspiblitz.conf
-fi
-source /mnt/hdd/raspiblitz.conf
 
 # switch on
 if [ "$1" = "1" ] || [ "$1" = "on" ]; then