From 8d24863cb940ae523491cf25dd5b5f483fc4912c Mon Sep 17 00:00:00 2001
From: Maciej Modzelewski <maciej@modzelewski.dev>
Date: Fri, 19 Mar 2021 06:21:36 +0100
Subject: [PATCH] Update GoDaddy DNS scripts

---
 dns_scripts/dns_add_godaddy | 2 +-
 dns_scripts/dns_godaddy     | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/dns_scripts/dns_add_godaddy b/dns_scripts/dns_add_godaddy
index dfd3b3b..835bb22 100755
--- a/dns_scripts/dns_add_godaddy
+++ b/dns_scripts/dns_add_godaddy
@@ -37,4 +37,4 @@ fi
 export GODADDY_KEY
 export GODADDY_SECRET
 
-$GODADDY_SCRIPT -q add "${fulldomain}" "_acme-challenge.${fulldomain}." "${token}"
+$GODADDY_SCRIPT -q add "${fulldomain}" "_acme-challenge" "${token}"
diff --git a/dns_scripts/dns_godaddy b/dns_scripts/dns_godaddy
index 4443bd4..7c36d19 100644
--- a/dns_scripts/dns_godaddy
+++ b/dns_scripts/dns_godaddy
@@ -155,7 +155,6 @@ if [ -z "$name" ]; then
     echo "'name' parameter is required, see -h" >&2
     exit 3
 fi
-! [[ "$name" =~ [.]$ ]] && name="${name}.${domain}."
 data="$4"
 if [ -z "$data" ]; then
     echo "'data' parameter is required, see -h" >&2
@@ -209,7 +208,7 @@ if [ "$op" = "add" ]; then
 
         url="$API/$domain/records/TXT/$name"
 
-        request='{"data":"'$data'","ttl":'$ttl'}'
+        request='[{"data":"'$data'","ttl":'$ttl'}]'
         [ -n "$DEBUG" ] && cat >&2 <<EOF
 Add request to: $url
 --------
@@ -337,7 +336,7 @@ EOF
 
 eval 'name="$''{name%'"'.$domain.'}"'"'
 
-match="$(printf '"name":"%s","data":"%s","ttl":' "$name" "$data")"
+match="$(printf '"data":"%s","name":"%s","ttl":' "$data" "$name")"
 cmd="$(printf 'echo %s%s%s | grep -v %s%s%s' "'" "$current" "'" "'" "$match" "'")"
 eval 'new="$('"$cmd"')"'