From f44dec2c8df66323733baad579970190fc7a25fa Mon Sep 17 00:00:00 2001
From: alviy <96288197+alviy@users.noreply.github.com>
Date: Thu, 25 Apr 2024 18:43:35 +0300
Subject: [PATCH 01/18] add new provider - Alviy.com

---
 dnsapi/dns_alviy.sh | 182 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 182 insertions(+)
 create mode 100644 dnsapi/dns_alviy.sh

diff --git a/dnsapi/dns_alviy.sh b/dnsapi/dns_alviy.sh
new file mode 100644
index 0000000000..4f736a9478
--- /dev/null
+++ b/dnsapi/dns_alviy.sh
@@ -0,0 +1,182 @@
+#!/usr/bin/env sh
+
+# Alviy domain api
+# Get API key and secret from https://cloud.alviy.com/token
+#
+# Alviy_token="some-secret-key"
+#
+# Ex.: acme.sh --issue --staging --dns dns_alviy -d "*.s.example.com" -d "s.example.com"
+
+Alviy_Api="https://cloud.alviy.com/api/v1"
+
+########  Public functions #####################
+
+#Usage: dns_alviy_add  _acme-challenge.www.domain.com   "content"
+dns_alviy_add() {
+  fulldomain=$1
+  txtvalue=$2
+
+  Alviy_token="${Alviy_token:-$(_readaccountconf_mutable Alviy_token)}"
+  if [ -z "$Alviy_token" ]; then
+    Alviy_token=""
+    _err "Please specify Alviy token."
+    return 1
+  fi
+
+  #save the api key and email to the account conf file.
+  _saveaccountconf_mutable Alviy_token "$Alviy_token"
+
+  _debug "First detect the root zone"
+  if ! _get_root "$fulldomain"; then
+    _err "invalid domain"
+    return 1
+  fi
+
+  _debug _sub_domain "$_sub_domain"
+  _debug _domain "$_domain"
+
+  _debug "Getting existing records"
+  if _alviy_txt_exists $_domain $fulldomain $txtvalue; then
+    _info "This record already exists, skipping"
+    return 0
+  fi
+
+  _add_data="{\"content\":\"$txtvalue\",\"type\":\"TXT\"}"
+  _debug2 _add_data "$_add_data"
+  _info "Adding record"
+  if _alviy_rest POST "zone/$_domain/domain/$fulldomain/" "$_add_data"; then
+    _debug "Checking updated records of '${fulldomain}'"
+
+    if ! _alviy_txt_exists $_domain $fulldomain $txtvalue; then
+      _err "TXT record '${txtvalue}' for '${fulldomain}', value wasn't set!"
+      return 1
+    fi
+
+  else
+    _err "Add txt record error, value '${txtvalue}' for '${fulldomain}' was not set."
+    return 1
+  fi
+
+  _sleep 10
+  _info "Added TXT record '${txtvalue}' for '${fulldomain}'."
+  return 0
+}
+
+#fulldomain
+dns_alviy_rm() {
+  fulldomain=$1
+  txtvalue=$2
+
+  Alviy_token="${Alviy_token:-$(_readaccountconf_mutable Alviy_token)}"
+
+  _debug "First detect the root zone"
+  if ! _get_root "$fulldomain"; then
+    _err "invalid domain"
+    return 1
+  fi
+
+  _debug _sub_domain "$_sub_domain"
+  _debug _domain "$_domain"
+
+  if ! _alviy_txt_exists $_domain $fulldomain $txtvalue; then
+    _info "The record does not exist, skip"
+    return 0
+  fi
+
+  _add_data=""
+  uuid=$(echo $response |tr "{" "\n"|grep $txtvalue|tr "," "\n"|grep uuid|cut -d \" -f4)
+  # delete record
+  _debug "Delete TXT record for '${fulldomain}'"
+  if ! _alviy_rest DELETE "zone/$_domain/record/$uuid" "{\"confirm\":1}"; then
+    _err "Cannot delete empty TXT record for '$fulldomain'"
+    return 1
+  fi
+  _info "The record '$fulldomain'='$txtvalue' deleted"
+}
+
+####################  Private functions below ##################################
+#_acme-challenge.www.domain.com
+#returns
+# _sub_domain=_acme-challenge.www
+# _domain=domain.com
+_get_root() {
+  domain=$1
+  i=2
+  p=1
+  while true; do
+    h=$(printf "%s" "$domain" | cut -d . -f $i-100)
+    if [ -z "$h" ]; then
+      #not valid
+      return 1
+    fi
+
+    if ! _alviy_rest GET "zone/$h"; then
+      return 1
+    fi
+
+    if _contains "$response" '"code":"NOT_FOUND"'; then
+      _debug "$h not found"
+    else
+      _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-$p)
+      _domain="$h"
+      return 0
+    fi
+    p="$i"
+    i=$(_math "$i" + 1)
+  done
+  return 1
+}
+
+_alviy_txt_exists() {
+  zone=$1
+  domain=$2
+  content_data=$3
+  _debug "Getting existing records"
+
+  if ! _alviy_rest GET "zone/$zone/domain/$domain/TXT/"; then
+    _info "The record does not exist"
+    return 1
+  fi
+
+  if ! _contains "$response" "$3"; then
+    _info "The record has other value"
+    return 1
+  fi
+  # GOOD code return - TRUE function
+  return 0
+}
+
+_alviy_rest() {
+  method=$1
+  path="$2"
+  content_data="$3"
+  _debug "$path"
+
+  export _H1="Authorization: Bearer $Alviy_token"
+  export _H2="Content-Type: application/json"
+
+  if [ "$content_data" ] || [ "$method" = "DELETE" ]; then
+    _debug "data ($method): " "$content_data"
+    response="$(_post "$content_data" "$Alviy_Api/$path" "" "$method")"
+  else
+    response="$(_get "$Alviy_Api/$path")"
+  fi
+  _code="$(grep "^HTTP" "$HTTP_HEADER" | _tail_n 1 | cut -d " " -f 2 | tr -d "\\r\\n")"
+  if [ "$_code" == "401" ]; then
+    _err "It seems that your api key or secret is not correct."
+    return 1
+  fi
+
+
+  if [ "$_code" != "200" ]; then
+    _err "API call error ($method): $path Response code $_code"
+  fi
+  if [ "$?" != "0" ]; then
+    _err "error on rest call ($method): $path. Response:"
+    _err "$response"
+    return 1
+  fi
+  _debug2 response "$response"
+  return 0
+}
+

From 78ba205f4d1da2ccda76482c4fb615333e7a91dd Mon Sep 17 00:00:00 2001
From: alviy <96288197+alviy@users.noreply.github.com>
Date: Thu, 25 Apr 2024 19:37:49 +0300
Subject: [PATCH 02/18] DNS test init

---
 dnsapi/dns_alviy.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dnsapi/dns_alviy.sh b/dnsapi/dns_alviy.sh
index 4f736a9478..31d6a9c9c6 100644
--- a/dnsapi/dns_alviy.sh
+++ b/dnsapi/dns_alviy.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/env sh
 
 # Alviy domain api
+#
 # Get API key and secret from https://cloud.alviy.com/token
 #
 # Alviy_token="some-secret-key"

From 2fcda9a73ae2f4a6d8dc30e12c61d14cfc8bc7ee Mon Sep 17 00:00:00 2001
From: alviy <96288197+alviy@users.noreply.github.com>
Date: Thu, 25 Apr 2024 22:07:29 +0300
Subject: [PATCH 03/18] Quotes recomendations

---
 dnsapi/dns_alviy.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dnsapi/dns_alviy.sh b/dnsapi/dns_alviy.sh
index 31d6a9c9c6..1077ec0609 100644
--- a/dnsapi/dns_alviy.sh
+++ b/dnsapi/dns_alviy.sh
@@ -37,7 +37,7 @@ dns_alviy_add() {
   _debug _domain "$_domain"
 
   _debug "Getting existing records"
-  if _alviy_txt_exists $_domain $fulldomain $txtvalue; then
+  if _alviy_txt_exists "$_domain" "$fulldomain" "$txtvalue"; then
     _info "This record already exists, skipping"
     return 0
   fi
@@ -48,7 +48,7 @@ dns_alviy_add() {
   if _alviy_rest POST "zone/$_domain/domain/$fulldomain/" "$_add_data"; then
     _debug "Checking updated records of '${fulldomain}'"
 
-    if ! _alviy_txt_exists $_domain $fulldomain $txtvalue; then
+    if ! _alviy_txt_exists "$_domain" "$fulldomain" "$txtvalue"; then
       _err "TXT record '${txtvalue}' for '${fulldomain}', value wasn't set!"
       return 1
     fi
@@ -79,13 +79,13 @@ dns_alviy_rm() {
   _debug _sub_domain "$_sub_domain"
   _debug _domain "$_domain"
 
-  if ! _alviy_txt_exists $_domain $fulldomain $txtvalue; then
+  if ! _alviy_txt_exists "$_domain" "$fulldomain" "$txtvalue"; then
     _info "The record does not exist, skip"
     return 0
   fi
 
   _add_data=""
-  uuid=$(echo $response |tr "{" "\n"|grep $txtvalue|tr "," "\n"|grep uuid|cut -d \" -f4)
+  uuid=$(echo "$response" |tr "{" "\n"|grep "$txtvalue"|tr "," "\n"|grep uuid|cut -d \" -f4)
   # delete record
   _debug "Delete TXT record for '${fulldomain}'"
   if ! _alviy_rest DELETE "zone/$_domain/record/$uuid" "{\"confirm\":1}"; then
@@ -163,7 +163,7 @@ _alviy_rest() {
     response="$(_get "$Alviy_Api/$path")"
   fi
   _code="$(grep "^HTTP" "$HTTP_HEADER" | _tail_n 1 | cut -d " " -f 2 | tr -d "\\r\\n")"
-  if [ "$_code" == "401" ]; then
+  if [ "$_code" = "401" ]; then
     _err "It seems that your api key or secret is not correct."
     return 1
   fi

From 2e9f1592252d7d7866de846449b89e1e1ed6da79 Mon Sep 17 00:00:00 2001
From: alviy <96288197+alviy@users.noreply.github.com>
Date: Thu, 25 Apr 2024 22:15:16 +0300
Subject: [PATCH 04/18] shfmt

---
 dnsapi/dns_alviy.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/dnsapi/dns_alviy.sh b/dnsapi/dns_alviy.sh
index 1077ec0609..975f20d444 100644
--- a/dnsapi/dns_alviy.sh
+++ b/dnsapi/dns_alviy.sh
@@ -85,7 +85,7 @@ dns_alviy_rm() {
   fi
 
   _add_data=""
-  uuid=$(echo "$response" |tr "{" "\n"|grep "$txtvalue"|tr "," "\n"|grep uuid|cut -d \" -f4)
+  uuid=$(echo "$response" | tr "{" "\n" | grep "$txtvalue" | tr "," "\n" | grep uuid | cut -d \" -f4)
   # delete record
   _debug "Delete TXT record for '${fulldomain}'"
   if ! _alviy_rest DELETE "zone/$_domain/record/$uuid" "{\"confirm\":1}"; then
@@ -168,7 +168,6 @@ _alviy_rest() {
     return 1
   fi
 
-
   if [ "$_code" != "200" ]; then
     _err "API call error ($method): $path Response code $_code"
   fi
@@ -180,4 +179,3 @@ _alviy_rest() {
   _debug2 response "$response"
   return 0
 }
-

From e1acea52f8de193e68d0b377c8b87cc8ddc03932 Mon Sep 17 00:00:00 2001
From: alviy <96288197+alviy@users.noreply.github.com>
Date: Thu, 25 Apr 2024 22:27:04 +0300
Subject: [PATCH 05/18] run DNS test

---
 dnsapi/dns_alviy.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dnsapi/dns_alviy.sh b/dnsapi/dns_alviy.sh
index 975f20d444..eab133cbd0 100644
--- a/dnsapi/dns_alviy.sh
+++ b/dnsapi/dns_alviy.sh
@@ -1,7 +1,6 @@
 #!/usr/bin/env sh
 
 # Alviy domain api
-#
 # Get API key and secret from https://cloud.alviy.com/token
 #
 # Alviy_token="some-secret-key"

From d1df5f3021d00418c2884895f5697b181b3d82cb Mon Sep 17 00:00:00 2001
From: alviy <96288197+alviy@users.noreply.github.com>
Date: Thu, 25 Apr 2024 22:36:11 +0300
Subject: [PATCH 06/18] test DNS

---
 dnsapi/dns_alviy.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dnsapi/dns_alviy.sh b/dnsapi/dns_alviy.sh
index eab133cbd0..3ea9ebd321 100644
--- a/dnsapi/dns_alviy.sh
+++ b/dnsapi/dns_alviy.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env sh
-
+#
 # Alviy domain api
 # Get API key and secret from https://cloud.alviy.com/token
 #

From 4a8c2251e0ba445a4cb68858132eece7d801ee54 Mon Sep 17 00:00:00 2001
From: alviy <96288197+alviy@users.noreply.github.com>
Date: Thu, 25 Apr 2024 22:47:53 +0300
Subject: [PATCH 07/18] 4th+ level domain

---
 dnsapi/dns_alviy.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dnsapi/dns_alviy.sh b/dnsapi/dns_alviy.sh
index 3ea9ebd321..fe1048fe61 100644
--- a/dnsapi/dns_alviy.sh
+++ b/dnsapi/dns_alviy.sh
@@ -104,7 +104,7 @@ _get_root() {
   i=2
   p=1
   while true; do
-    h=$(printf "%s" "$domain" | cut -d . -f $i-100)
+    h=$(printf "%s" "$domain"  | rev | cut -d . -f 1-2 | rev )
     if [ -z "$h" ]; then
       #not valid
       return 1

From c0b87adee55076b4ef23b496e4ee9cc50c40b7ec Mon Sep 17 00:00:00 2001
From: alviy <96288197+alviy@users.noreply.github.com>
Date: Thu, 25 Apr 2024 22:51:32 +0300
Subject: [PATCH 08/18] shfmt

---
 dnsapi/dns_alviy.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dnsapi/dns_alviy.sh b/dnsapi/dns_alviy.sh
index fe1048fe61..8ff2684eeb 100644
--- a/dnsapi/dns_alviy.sh
+++ b/dnsapi/dns_alviy.sh
@@ -104,7 +104,7 @@ _get_root() {
   i=2
   p=1
   while true; do
-    h=$(printf "%s" "$domain"  | rev | cut -d . -f 1-2 | rev )
+    h=$(printf "%s" "$domain" | rev | cut -d . -f 1-2 | rev)
     if [ -z "$h" ]; then
       #not valid
       return 1

From 7ef1340e2add05a48189312f1a7f507224087fc7 Mon Sep 17 00:00:00 2001
From: alviy <96288197+alviy@users.noreply.github.com>
Date: Thu, 25 Apr 2024 23:16:11 +0300
Subject: [PATCH 09/18] Update dns_alviy.sh

---
 dnsapi/dns_alviy.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dnsapi/dns_alviy.sh b/dnsapi/dns_alviy.sh
index 8ff2684eeb..d90513e820 100644
--- a/dnsapi/dns_alviy.sh
+++ b/dnsapi/dns_alviy.sh
@@ -110,7 +110,7 @@ _get_root() {
       return 1
     fi
 
-    if ! _alviy_rest GET "zone/$h"; then
+    if ! _alviy_rest GET "zone/$h/"; then
       return 1
     fi
 

From 03b53cbb60c9131d872637016f759b7bb57cfbe2 Mon Sep 17 00:00:00 2001
From: alviy <96288197+alviy@users.noreply.github.com>
Date: Fri, 26 Apr 2024 20:38:01 +0300
Subject: [PATCH 10/18] run DNS test

---
 dnsapi/dns_alviy.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dnsapi/dns_alviy.sh b/dnsapi/dns_alviy.sh
index d90513e820..6e75c9ab83 100644
--- a/dnsapi/dns_alviy.sh
+++ b/dnsapi/dns_alviy.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/env sh
 #
 # Alviy domain api
+#
 # Get API key and secret from https://cloud.alviy.com/token
 #
 # Alviy_token="some-secret-key"

From 4bf4259dda037e6c2c117e8e7e7d9618cd36dfb3 Mon Sep 17 00:00:00 2001
From: alviy <96288197+alviy@users.noreply.github.com>
Date: Fri, 26 Apr 2024 23:05:42 +0300
Subject: [PATCH 11/18] Update _get_root logic

---
 dnsapi/dns_alviy.sh | 36 ++++++++++++++++--------------------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/dnsapi/dns_alviy.sh b/dnsapi/dns_alviy.sh
index 6e75c9ab83..6a99c6da6f 100644
--- a/dnsapi/dns_alviy.sh
+++ b/dnsapi/dns_alviy.sh
@@ -103,28 +103,24 @@ dns_alviy_rm() {
 _get_root() {
   domain=$1
   i=2
-  p=1
-  while true; do
-    h=$(printf "%s" "$domain" | rev | cut -d . -f 1-2 | rev)
-    if [ -z "$h" ]; then
-      #not valid
-      return 1
-    fi
+  h=$(printf "%s" "$domain" | rev | cut -d . -f 1-2 | rev)
+  if [ -z "$h" ]; then
+    #not valid
+	_debug "can't get host from $domain"
+    return 1
+  fi
 
-    if ! _alviy_rest GET "zone/$h/"; then
-      return 1
-    fi
+  if ! _alviy_rest GET "zone/$h/"; then
+	return 1
+  fi
 
-    if _contains "$response" '"code":"NOT_FOUND"'; then
-      _debug "$h not found"
-    else
-      _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-$p)
-      _domain="$h"
-      return 0
-    fi
-    p="$i"
-    i=$(_math "$i" + 1)
-  done
+  if _contains "$response" '"code":"NOT_FOUND"'; then
+    _debug "$h not found"
+  else
+    _sub_domain=$(printf "%s" "$domain" | rev | cut -d . -f 3- | rev)
+    _domain="$h"
+    return 0
+  fi
   return 1
 }
 

From 1078fdc157072d88d7658ef92f4ed4b359f904e3 Mon Sep 17 00:00:00 2001
From: alviy <96288197+alviy@users.noreply.github.com>
Date: Fri, 26 Apr 2024 23:25:38 +0300
Subject: [PATCH 12/18] fix Shellcheck

---
 dnsapi/dns_alviy.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dnsapi/dns_alviy.sh b/dnsapi/dns_alviy.sh
index 6a99c6da6f..2f8b7994fe 100644
--- a/dnsapi/dns_alviy.sh
+++ b/dnsapi/dns_alviy.sh
@@ -102,16 +102,16 @@ dns_alviy_rm() {
 # _domain=domain.com
 _get_root() {
   domain=$1
-  i=2
   h=$(printf "%s" "$domain" | rev | cut -d . -f 1-2 | rev)
   if [ -z "$h" ]; then
     #not valid
-	_debug "can't get host from $domain"
+    hd=$(printf "%s" "$domain" | rev)
+    _debug "can't get host from $domain $hd"
     return 1
   fi
 
   if ! _alviy_rest GET "zone/$h/"; then
-	return 1
+    return 1
   fi
 
   if _contains "$response" '"code":"NOT_FOUND"'; then

From e814cccc4490d1b8c2552258e260e8537e57cbec Mon Sep 17 00:00:00 2001
From: alviy <96288197+alviy@users.noreply.github.com>
Date: Sat, 27 Apr 2024 00:06:22 +0300
Subject: [PATCH 13/18] Update dns_alviy.sh

---
 dnsapi/dns_alviy.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dnsapi/dns_alviy.sh b/dnsapi/dns_alviy.sh
index 2f8b7994fe..93b5750ffc 100644
--- a/dnsapi/dns_alviy.sh
+++ b/dnsapi/dns_alviy.sh
@@ -105,8 +105,8 @@ _get_root() {
   h=$(printf "%s" "$domain" | rev | cut -d . -f 1-2 | rev)
   if [ -z "$h" ]; then
     #not valid
-    hd=$(printf "%s" "$domain" | rev)
-    _debug "can't get host from $domain $hd"
+    _alviy_rest GET "zone/$domain/"
+    _debug "can't get host from $domain"
     return 1
   fi
 

From dbe7cb8dbb5650169f8d21f2efce6a06bd9175c6 Mon Sep 17 00:00:00 2001
From: alviy <96288197+alviy@users.noreply.github.com>
Date: Sat, 27 Apr 2024 09:55:38 +0300
Subject: [PATCH 14/18] remove rev command

---
 dnsapi/dns_alviy.sh | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/dnsapi/dns_alviy.sh b/dnsapi/dns_alviy.sh
index 93b5750ffc..9501bff17a 100644
--- a/dnsapi/dns_alviy.sh
+++ b/dnsapi/dns_alviy.sh
@@ -102,7 +102,15 @@ dns_alviy_rm() {
 # _domain=domain.com
 _get_root() {
   domain=$1
-  h=$(printf "%s" "$domain" | rev | cut -d . -f 1-2 | rev)
+  i=3
+  a="init"
+  while [ ! -z $a ]
+  do
+    a=$(printf "%s" "$domain" | cut -d . -f $i-)
+    i=`expr $i + 1`
+  done
+  num=`expr $i - 3`
+  h=$(printf "%s" "$domain" | cut -d . -f $num-)
   if [ -z "$h" ]; then
     #not valid
     _alviy_rest GET "zone/$domain/"
@@ -117,7 +125,8 @@ _get_root() {
   if _contains "$response" '"code":"NOT_FOUND"'; then
     _debug "$h not found"
   else
-    _sub_domain=$(printf "%s" "$domain" | rev | cut -d . -f 3- | rev)
+    s_n=`expr $num - 1`
+    _sub_domain=$(printf "%s" "$domain" | cut -d . -f -$s_n)
     _domain="$h"
     return 0
   fi

From dab244ad2536f43727065700de807d65d4ebaeef Mon Sep 17 00:00:00 2001
From: alviy <96288197+alviy@users.noreply.github.com>
Date: Sat, 27 Apr 2024 11:29:30 +0300
Subject: [PATCH 15/18] shfmt

---
 dnsapi/dns_alviy.sh | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/dnsapi/dns_alviy.sh b/dnsapi/dns_alviy.sh
index 9501bff17a..d87d1c6eec 100644
--- a/dnsapi/dns_alviy.sh
+++ b/dnsapi/dns_alviy.sh
@@ -104,13 +104,12 @@ _get_root() {
   domain=$1
   i=3
   a="init"
-  while [ ! -z $a ]
-  do
+  while [ ! -z $a ]; do
     a=$(printf "%s" "$domain" | cut -d . -f $i-)
-    i=`expr $i + 1`
+    i=$(($i + 1))
   done
-  num=`expr $i - 3`
-  h=$(printf "%s" "$domain" | cut -d . -f $num-)
+  n=$(($i - 3))
+  h=$(printf "%s" "$domain" | cut -d . -f $n-)
   if [ -z "$h" ]; then
     #not valid
     _alviy_rest GET "zone/$domain/"
@@ -125,8 +124,8 @@ _get_root() {
   if _contains "$response" '"code":"NOT_FOUND"'; then
     _debug "$h not found"
   else
-    s_n=`expr $num - 1`
-    _sub_domain=$(printf "%s" "$domain" | cut -d . -f -$s_n)
+    s=$(($n - 1))
+    _sub_domain=$(printf "%s" "$domain" | cut -d . -f -$s)
     _domain="$h"
     return 0
   fi

From 54eec82311c90cca2ce99ff97e5c8132679e1e50 Mon Sep 17 00:00:00 2001
From: alviy <96288197+alviy@users.noreply.github.com>
Date: Sat, 27 Apr 2024 11:45:14 +0300
Subject: [PATCH 16/18] spellcheck

---
 dnsapi/dns_alviy.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dnsapi/dns_alviy.sh b/dnsapi/dns_alviy.sh
index d87d1c6eec..77c164057b 100644
--- a/dnsapi/dns_alviy.sh
+++ b/dnsapi/dns_alviy.sh
@@ -104,11 +104,11 @@ _get_root() {
   domain=$1
   i=3
   a="init"
-  while [ ! -z $a ]; do
+  while [ -n $a ]; do
     a=$(printf "%s" "$domain" | cut -d . -f $i-)
-    i=$(($i + 1))
+    i=$((i + 1))
   done
-  n=$(($i - 3))
+  n=$((i - 3))
   h=$(printf "%s" "$domain" | cut -d . -f $n-)
   if [ -z "$h" ]; then
     #not valid
@@ -124,7 +124,7 @@ _get_root() {
   if _contains "$response" '"code":"NOT_FOUND"'; then
     _debug "$h not found"
   else
-    s=$(($n - 1))
+    s=$((n - 1))
     _sub_domain=$(printf "%s" "$domain" | cut -d . -f -$s)
     _domain="$h"
     return 0

From d73953af3d5442179874d03f67c460e9cf043280 Mon Sep 17 00:00:00 2001
From: alviy <96288197+alviy@users.noreply.github.com>
Date: Sat, 27 Apr 2024 12:28:06 +0300
Subject: [PATCH 17/18] spellcheck

---
 dnsapi/dns_alviy.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dnsapi/dns_alviy.sh b/dnsapi/dns_alviy.sh
index 77c164057b..94832e1630 100644
--- a/dnsapi/dns_alviy.sh
+++ b/dnsapi/dns_alviy.sh
@@ -104,7 +104,7 @@ _get_root() {
   domain=$1
   i=3
   a="init"
-  while [ -n $a ]; do
+  while [ -n "$a" ]; do
     a=$(printf "%s" "$domain" | cut -d . -f $i-)
     i=$((i + 1))
   done

From aa41df4e7db492f1243e4828203ceaed67d7da96 Mon Sep 17 00:00:00 2001
From: alviy <96288197+alviy@users.noreply.github.com>
Date: Sat, 27 Apr 2024 13:49:37 +0300
Subject: [PATCH 18/18] run test

---
 dnsapi/dns_alviy.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dnsapi/dns_alviy.sh b/dnsapi/dns_alviy.sh
index 94832e1630..2217b0dfc4 100644
--- a/dnsapi/dns_alviy.sh
+++ b/dnsapi/dns_alviy.sh
@@ -1,5 +1,4 @@
 #!/usr/bin/env sh
-#
 # Alviy domain api
 #
 # Get API key and secret from https://cloud.alviy.com/token