From d1be3ce09239a1c41d498531319b87773e668c2c Mon Sep 17 00:00:00 2001
From: rootzoll <christian@geektank.de>
Date: Tue, 21 Aug 2018 03:41:46 +0200
Subject: [PATCH] moving getpublic script to assets

---
 build.sdcard/raspbianStretchDesktop.sh | 49 --------------------------
 home.admin/10setupBlitz.sh             | 11 ++++++
 home.admin/assets/getpublicip.service  | 20 +++++++++++
 home.admin/assets/getpublicip.sh       | 17 +++++++++
 4 files changed, 48 insertions(+), 49 deletions(-)
 create mode 100644 home.admin/assets/getpublicip.service
 create mode 100644 home.admin/assets/getpublicip.sh

diff --git a/build.sdcard/raspbianStretchDesktop.sh b/build.sdcard/raspbianStretchDesktop.sh
index 78629b0..2d6e25f 100644
--- a/build.sdcard/raspbianStretchDesktop.sh
+++ b/build.sdcard/raspbianStretchDesktop.sh
@@ -189,55 +189,6 @@ echo "*** LND ***"
 lndVersion="0.4.2-beta"
 olaoluwaPGP="65317176B6857F98834EDBE8964EA263DD637C21"
 
-# setup public ip service
-cat > ./getpublicip.sh <<EOF
-#!/bin/bash
-# RaspiBolt LND Mainnet: script to get public ip address
-# /usr/local/bin/getpublicip.sh
-
-echo 'getpublicip.sh started, writing public IP address every 10 minutes into /run/publicip'
-while [ 0 ];
-    do
-    torExists=$(sudo ls /mnt/hdd/tor/lnd9735/hostname 2>/dev/null | grep hostname -c)
-    if [ ${torExists} -eq 1 ]; then
-      # use tor onion address
-      printf "PUBLICIP=$(sudo cat /mnt/hdd/tor/lnd9735/hostname)\n" > /run/publicip;
-    else
-      # get public IP
-      printf "PUBLICIP=$(curl -vv ipinfo.io/ip 2> /run/publicip.log)\n" > /run/publicip;
-    fi
-    sleep 600
-done;
-EOF
-sudo mv ./getpublicip.sh /usr/local/bin/getpublicip.sh
-sudo chmod +x /usr/local/bin/getpublicip.sh
-cat > ./getpublicip.service <<EOF
-# RaspiBolt LND Mainnet: systemd unit for getpublicip.sh script
-# /etc/systemd/system/getpublicip.service
-
-[Unit]
-Description=getpublicip.sh: get public ip address from ipinfo.io
-After=network.target
-
-[Service]
-User=root
-Group=root
-Type=simple
-ExecStart=/usr/local/bin/getpublicip.sh
-ExecStartPost=/bin/sleep 5
-Restart=always
-
-RestartSec=600
-TimeoutSec=10
-
-[Install]
-WantedBy=multi-user.target
-EOF
-sudo mv ./getpublicip.service /etc/systemd/system/getpublicip.service
-sudo systemctl enable getpublicip
-sudo systemctl start getpublicip
-
-
 # WORKAROUND: UNTIL LND 0.4.3 arm binary version is here ... we need to build from source to 
 # have TOR integration ... so the following is commented out for now:
 #
diff --git a/home.admin/10setupBlitz.sh b/home.admin/10setupBlitz.sh
index 18c1314..1395dcc 100755
--- a/home.admin/10setupBlitz.sh
+++ b/home.admin/10setupBlitz.sh
@@ -9,6 +9,17 @@ 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/assets/getpublicip.service b/home.admin/assets/getpublicip.service
new file mode 100644
index 0000000..5931205
--- /dev/null
+++ b/home.admin/assets/getpublicip.service
@@ -0,0 +1,20 @@
+# RaspiBolt LND Mainnet: systemd unit for getpublicip.sh script
+# /etc/systemd/system/getpublicip.service
+
+[Unit]
+Description=getpublicip.sh: get public ip address from ipinfo.io
+After=network.target
+
+[Service]
+User=root
+Group=root
+Type=simple
+ExecStart=/usr/local/bin/getpublicip.sh
+ExecStartPost=/bin/sleep 5
+Restart=always
+
+RestartSec=600
+TimeoutSec=10
+
+[Install]
+WantedBy=multi-user.target
\ No newline at end of file
diff --git a/home.admin/assets/getpublicip.sh b/home.admin/assets/getpublicip.sh
new file mode 100644
index 0000000..479ddca
--- /dev/null
+++ b/home.admin/assets/getpublicip.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+# RaspiBolt LND Mainnet: script to get public ip address
+# /usr/local/bin/getpublicip.sh
+
+echo 'getpublicip.sh started, writing public IP address every 10 minutes into /run/publicip'
+while [ 0 ];
+    do
+    torExists=$(sudo ls /mnt/hdd/tor/lnd9735/hostname 2>/dev/null | grep hostname -c)
+    if [ ${torExists} -eq 1 ]; then
+      # use tor onion address
+      printf "PUBLICIP=$(sudo cat /mnt/hdd/tor/lnd9735/hostname)\n" > /run/publicip;
+    else
+      # get public IP
+      printf "PUBLICIP=$(curl -vv ipinfo.io/ip 2> /run/publicip.log)\n" > /run/publicip;
+    fi
+    sleep 600
+done;
\ No newline at end of file