From ff8c6c3c01783093ed29e2c68af9564120c292b7 Mon Sep 17 00:00:00 2001
From: Logan G <logan@qtechofficial.com>
Date: Sat, 17 Feb 2024 13:17:52 -0700
Subject: [PATCH] Updated Njalla OpenWRT DDNS script to minimize duplicate code

---
 openwrt-njalla-ddns.sh | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/openwrt-njalla-ddns.sh b/openwrt-njalla-ddns.sh
index d3852ad..caf0530 100644
--- a/openwrt-njalla-ddns.sh
+++ b/openwrt-njalla-ddns.sh
@@ -13,19 +13,18 @@ network_find_wan6 NET_IF6
 network_get_ipaddr NET_ADDR "${NET_IF}"
 network_get_ipaddr6 NET_ADDR6 "${NET_IF6}"
 
-if [ "$1" = "--query" ]; then
+if [ "$1" = "--query" ] || [ ! -f ${IP_TEMPFILE} ]; then
     echo "Querying IP from DNS server"
     NET_ADDR_OLD="$(nslookup -type=a ${NJALLA_SUBDOMAIN} | awk '/^Address: / { print $2 }')"
     NET_ADDR6_OLD="$(nslookup -type=aaaa ${NJALLA_SUBDOMAIN} | awk '/^Address: / { print $2 }')"
-else
-    if [ -f ${IP_TEMPFILE} ]; then
-        . ${IP_TEMPFILE}
-    else
-        NET_ADDR_OLD="$(nslookup -type=a ${NJALLA_SUBDOMAIN} | awk '/^Address: / { print $2 }')"
-        NET_ADDR6_OLD="$(nslookup -type=aaaa ${NJALLA_SUBDOMAIN} | awk '/^Address: / { print $2 }')"
-        echo "NET_ADDR_OLD=${NET_ADDR}" > $IP_TEMPFILE
-        echo "NET_ADDR6_OLD=${NET_ADDR6}" >> $IP_TEMPFILE
+
+    if [ ! -f ${IP_TEMPFILE} ]; then
+        touch ${IP_TEMPFILE} || exit 1
+        echo "NET_ADDR_OLD=${NET_ADDR_OLD}" > $IP_TEMPFILE
+        echo "NET_ADDR6_OLD=${NET_ADDR6_OLD}" >> $IP_TEMPFILE
     fi
+else
+    . ${IP_TEMPFILE}
 fi
 
 if [ "$NET_ADDR" != "$NET_ADDR_OLD" ] || [ "$NET_ADDR6" != "$NET_ADDR6_OLD" ] || [ "$1" = "--force" ]; then