From c22a3b3fa1747eddeab1f09713ea10ae532c36ef Mon Sep 17 00:00:00 2001
From: rootzoll <christian@geektank.de>
Date: Tue, 11 Dec 2018 19:17:35 +0100
Subject: [PATCH] fix to total pathes

---
 home.admin/90finishSetup.sh        |  8 +++++++-
 home.admin/95finalSetup.sh         |  8 +-------
 home.admin/_bootstrap.migration.sh |  2 +-
 home.admin/_bootstrap.provision.sh | 20 +++++++++++++++++---
 4 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/home.admin/90finishSetup.sh b/home.admin/90finishSetup.sh
index eb8d22a76..aec3f30d7 100755
--- a/home.admin/90finishSetup.sh
+++ b/home.admin/90finishSetup.sh
@@ -2,7 +2,7 @@
 echo ""
 
 # add bonus scripts
-./91addBonus.sh
+/home/admin/91addBonus.sh
 
 ###### SWAP & FS
 echo ""
@@ -73,6 +73,12 @@ echo "enable lazy firewall"
 sudo ufw --force enable
 echo ""
 
+# set raspi config as environment for lnd service
+sudo systemctl stop lnd
+sudo systemctl disable lnd
+sudo sed -i "s/^EnvironmentFile=.*/EnvironmentFile=\/mnt\/hdd\/raspiblitz.conf/g" /etc/systemd/system/lnd.service
+sudo systemctl enable lnd
+
 # update system
 echo ""
 echo "*** Update System ***"
diff --git a/home.admin/95finalSetup.sh b/home.admin/95finalSetup.sh
index ee35f7094..0f9b424b9 100755
--- a/home.admin/95finalSetup.sh
+++ b/home.admin/95finalSetup.sh
@@ -30,13 +30,7 @@ echo "network=${network}" >> $configFile
 echo "chain=${chain}" >> $configFile
 
 # let migration/init script do the rest
-./_bootstrap.migration.sh
-
-# set raspi config as environment for lnd service
-sudo systemctl stop lnd
-sudo systemctl disable lnd
-sudo sed -i "s/^EnvironmentFile=.*/EnvironmentFile=\/mnt\/hdd\/raspiblitz.conf/g" /etc/systemd/system/lnd.service
-sudo systemctl enable lnd
+/home/admin/_bootstrap.migration.sh
 
 # copy logfile to analyse setup
 cp $logFile /home/admin/raspiblitz.setup.log
diff --git a/home.admin/_bootstrap.migration.sh b/home.admin/_bootstrap.migration.sh
index 2ee53889a..27aaff651 100644
--- a/home.admin/_bootstrap.migration.sh
+++ b/home.admin/_bootstrap.migration.sh
@@ -30,7 +30,7 @@ source ${configFile}
 # check if config files contains basic: network
 if [ ${#network} -eq 0 ]; then
   echo "FAIL see ${logFile}"
-  echo "FAIL: missing network in (${configFile})!"
+  echo "FAIL: missing network in (${configFile})!" >> ${logFile}
   exit 1
 fi
 
diff --git a/home.admin/_bootstrap.provision.sh b/home.admin/_bootstrap.provision.sh
index c170b2ee5..f197b5366 100644
--- a/home.admin/_bootstrap.provision.sh
+++ b/home.admin/_bootstrap.provision.sh
@@ -26,6 +26,20 @@ if [ ${configExists} -eq 0 ]; then
   exit 1
 fi
 
+# check if config files contains basic: network
+if [ ${#network} -eq 0 ]; then
+  echo "FAIL see ${logFile}"
+  echo "FAIL: missing network in (${configFile})!" >> ${logFile}
+  exit 1
+fi
+
+# check if config files contains basic: chain
+if [ ${#chain} -eq 0 ]; then
+  echo "FAIL see ${logFile}"
+  echo "FAIL: missing chain in (${configFile})!" >> ${logFile}
+  exit 1
+fi
+
 ##########################
 # BASIC SYSTEM SETTINGS
 ##########################
@@ -64,14 +78,14 @@ sudo cp /home/admin/assets/${network}d.service /etc/systemd/system/${network}d.s
 sudo chmod +x /etc/systemd/system/${network}d.service >> ${logFile} 2>&1
 sudo systemctl daemon-reload >> ${logFile} 2>&1
 sudo systemctl enable ${network}d.service >> ${logFile} 2>&1
-sed -i "5s/.*/Wants=${network}d.service/" ./assets/lnd.service >> ${logFile} 2>&1
-sed -i "6s/.*/After=${network}d.service/" ./assets/lnd.service >> ${logFile} 2>&1
+sed -i "5s/.*/Wants=${network}d.service/" /home/admin/assets/lnd.service >> ${logFile} 2>&1
+sed -i "6s/.*/After=${network}d.service/" /home/admin/assets/lnd.service >> ${logFile} 2>&1
 sudo cp /home/admin/assets/lnd.service /etc/systemd/system/lnd.service >> ${logFile} 2>&1
 sudo chmod +x /etc/systemd/system/lnd.service >> ${logFile} 2>&1
 sudo systemctl enable lnd >> ${logFile} 2>&1
 
 # finish setup (SWAP, Benus, Firewall, Update, ..)
-./90finishSetup.sh >> ${logFile} 2>&1
+/home/admin/90finishSetup.sh >> ${logFile} 2>&1
 
 # set the local network hostname
 if [ ${#hostname} -gt 0 ]; then