From eaee3e1538a56b9cf6225357b4126daaec6f3cc2 Mon Sep 17 00:00:00 2001
From: rootzoll <christian@geektank.de>
Date: Tue, 21 Aug 2018 18:44:17 +0200
Subject: [PATCH] moved install position of getpubliip

---
 home.admin/10setupBlitz.sh | 11 -----------
 home.admin/20initDialog.sh | 14 +++++++++++++-
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/home.admin/10setupBlitz.sh b/home.admin/10setupBlitz.sh
index e9451b1..e0c9b44 100755
--- a/home.admin/10setupBlitz.sh
+++ b/home.admin/10setupBlitz.sh
@@ -9,17 +9,6 @@ network=`cat .network`
 # and re-enters the setup process at the correct spot
 # in case it got interrupted
 
-getpublicipExists=$(sudo ls /usr/local/bin/getpublicip.sh 2>/dev/null | grep "getpublicip.sh" -c)
-if [ ${getpublicipExists} -eq 0 ]; then
-  echo "*** Installing getPublic ip script and service *** "
-  sudo cp ./assets/getpublicip.sh /usr/local/bin/getpublicip.sh
-  sudo chmod +x /usr/local/bin/getpublicip.sh
-  sudo cp ./assets/getpublicip.service /etc/systemd/system/getpublicip.service
-  sudo systemctl enable getpublicip
-  sudo systemctl start getpublicip
-  echo ""
-fi
-
 # check if lightning is running
 lndRunning=$(systemctl status lnd.service | grep -c running)
 if [ ${lndRunning} -eq 1 ]; then
diff --git a/home.admin/20initDialog.sh b/home.admin/20initDialog.sh
index 5dca3c5..e483535 100755
--- a/home.admin/20initDialog.sh
+++ b/home.admin/20initDialog.sh
@@ -78,4 +78,16 @@ sed -i "s/^${network}d.rpcpass=.*/${network}d.rpcpass=${result}/g" /home/admin/a
 
 # success info dialog
 dialog --backtitle "RaspiBlitz - SetUP" --msgbox "OK - RPC password changed to '$result'\n\nNow starting the Setup of your RaspiBlitz." 7 52
-clear
\ No newline at end of file
+clear
+
+# init get publicip service
+getpublicipExists=$(sudo ls /usr/local/bin/getpublicip.sh 2>/dev/null | grep "getpublicip.sh" -c)
+if [ ${getpublicipExists} -eq 0 ]; then
+  echo "*** Installing getPublic ip script and service *** "
+  sudo cp ./assets/getpublicip.sh /usr/local/bin/getpublicip.sh
+  sudo chmod +x /usr/local/bin/getpublicip.sh
+  sudo cp ./assets/getpublicip.service /etc/systemd/system/getpublicip.service
+  sudo systemctl enable getpublicip
+  sudo systemctl start getpublicip
+  echo ""
+fi
\ No newline at end of file