From bac3f6502317cffa083400582782908a49e8fd2f Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pvizeli@syshack.ch>
Date: Fri, 30 Aug 2019 10:25:38 +0200
Subject: [PATCH] Small bugfix with dehydrated lock files (#677)

* Small bugfix with dehydrated lock files

* Fix if

* Small cleanup
---
 duckdns/CHANGELOG.md |  4 ++++
 duckdns/config.json  |  2 +-
 duckdns/data/run.sh  | 28 ++++++++++++++++------------
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/duckdns/CHANGELOG.md b/duckdns/CHANGELOG.md
index 42cd389..2865574 100644
--- a/duckdns/CHANGELOG.md
+++ b/duckdns/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.10
+
+- Fix issue with dehydrated lock file
+
 ## 1.9
 
 - Fix issue with empty IPv4 / IPv6
diff --git a/duckdns/config.json b/duckdns/config.json
index 6e8fbc6..d51c72d 100644
--- a/duckdns/config.json
+++ b/duckdns/config.json
@@ -1,6 +1,6 @@
 {
   "name": "Duck DNS",
-  "version": "1.9",
+  "version": "1.10",
   "slug": "duckdns",
   "description": "Free Dynamic DNS (DynDNS or DDNS) service with Let's Encrypt support",
   "url": "https://www.home-assistant.io/addons/duckdns/",
diff --git a/duckdns/data/run.sh b/duckdns/data/run.sh
index d5156a5..0d5bbd0 100755
--- a/duckdns/data/run.sh
+++ b/duckdns/data/run.sh
@@ -21,35 +21,39 @@ function le_renew() {
     domains=$(bashio::config 'domains')
 
     # Prepare domain for Let's Encrypt
-    for domain in $domains; do
-        domain_args+=("--domain" "$domain")
+    for domain in ${domains}; do
+        domain_args+=("--domain" "${domain}")
     done
     
-    dehydrated --cron --hook ./hooks.sh --challenge dns-01 "${domain_args[@]}" --out "$CERT_DIR" --config "$WORK_DIR/config" || true
+    dehydrated --cron --hook ./hooks.sh --challenge dns-01 "${domain_args[@]}" --out "${CERT_DIR}" --config "${WORK_DIR}/config" || true
     LE_UPDATE="$(date +%s)"
 }
 
 # Register/generate certificate if terms accepted
 if bashio::config.true 'lets_encrypt.accept_terms'; then
     # Init folder structs
-    mkdir -p "$CERT_DIR"
-    mkdir -p "$WORK_DIR"
+    mkdir -p "${CERT_DIR}"
+    mkdir -p "${WORK_DIR}"
     
     # Generate new certs
-    if [ ! -d "$CERT_DIR/live" ]; then
+    if [ ! -d "${CERT_DIR}/live" ]; then
         # Create empty dehydrated config file so that this dir will be used for storage
-        touch "$WORK_DIR/config"
+        touch "${WORK_DIR}/config"
         
-        dehydrated --register --accept-terms --config "$WORK_DIR/config"
+        dehydrated --register --accept-terms --config "${WORK_DIR}/config"
+    elif [ -e "${WORK_DIR}/lock" ]; then
+        # Some user reports issue with lock files/cleanup
+        rm -rf "${WORK_DIR}/lock"
+        bashio::log.warning "Reset dehydrated lock file"
     fi
 fi
 
 # Run duckdns
 while true; do
-    if answer="$(curl -sk "https://www.duckdns.org/update?domains=$DOMAINS&token=$TOKEN&ip=$IPV4&ipv6=$IPV6&verbose=true")"; then
-        bashio::log.info "$answer"
+    if answer="$(curl -sk "https://www.duckdns.org/update?domains=${DOMAINS}&token=${TOKEN}&ip=${IPV4}&ipv6=${IPV6}&verbose=true")"; then
+        bashio::log.info "${answer}"
     else
-        bashio::log.warning "$answer"
+        bashio::log.warning "${answer}"
     fi
     
     now="$(date +%s)"
@@ -57,5 +61,5 @@ while true; do
         le_renew
     fi
     
-    sleep "$WAIT_TIME"
+    sleep "${WAIT_TIME}"
 done