From 2cab4485feba34c2eee7f4aba0176e7360a92d49 Mon Sep 17 00:00:00 2001
From: Franck Nijhof <frenck@addons.community>
Date: Wed, 11 Aug 2021 22:05:53 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=91=20Fix=20yq=20for=20the=20v4=20synt?=
 =?UTF-8?q?ax=20(#234)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 🚑 Fix yq for the v4 syntax

* Shellcheck warning
---
 adguard/rootfs/etc/cont-init.d/adguard.sh | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/adguard/rootfs/etc/cont-init.d/adguard.sh b/adguard/rootfs/etc/cont-init.d/adguard.sh
index 70d9483..998eeae 100644
--- a/adguard/rootfs/etc/cont-init.d/adguard.sh
+++ b/adguard/rootfs/etc/cont-init.d/adguard.sh
@@ -5,7 +5,6 @@
 # Handles configuration
 # ==============================================================================
 readonly CONFIG="/data/adguard/AdGuardHome.yaml"
-declare port
 declare schema_version
 declare -a hosts
 declare part
@@ -17,25 +16,24 @@ if ! bashio::fs.file_exists "${CONFIG}"; then
     cp /etc/adguard/AdGuardHome.yaml "${CONFIG}"
 fi
 
-port=$(bashio::addon.port "53/udp")
-yq write --inplace "${CONFIG}" \
-    dns.port "${port}" \
+port=$(bashio::addon.port "53/udp") \
+  yq e --inplace '.dns.port = env(port)' "${CONFIG}" \
     || bashio::exit.nok 'Failed updating AdGuardHome DNS port'
 
 
 # Bump schema version in case this is an upgrade path
-schema_version=$(yq read "${CONFIG}" schema_version)
+schema_version=$(yq e '.schema_version // ""' "${CONFIG}")
 if bashio::var.has_value "${schema_version+}"; then
     if (( schema_version == 7 )); then
         # Clean up old interface bind formats
-        yq delete --inplace "${CONFIG}" dns.bind_host
-        yq write --inplace "${CONFIG}" schema_version 8
+        yq --inplace e 'del(.dns.bind_host)' "${CONFIG}" 
+        yq --inplace e '.schema_version = 8' "${CONFIG}"
     fi
 
     # Warn if this is an upgrade from below schema version 7, skip further process
     if (( schema_version < 7 )); then
         # Ensure dummy value exists so AdGuard doesn't kill itself during migration
-        yq write --inplace "${CONFIG}" dns.bind_host "127.0.0.1"
+        yq --inplace e '.dns.bind_host = "127.0.0.1"' "${CONFIG}"
         bashio::warning
         bashio::warning "AdGuard Home needs to update its configuration schema"
         bashio::warning "you might need to restart he add-on once more to complete"
@@ -46,7 +44,7 @@ if bashio::var.has_value "${schema_version+}"; then
 else
     # No idea what the schema is, might be an old config?
     # Ensure dummy value exists so AdGuard doesn't kill itself during migration
-    yq write --inplace "${CONFIG}" dns.bind_host "127.0.0.1"
+    yq --inplace e '.dns.bind_host = "127.0.0.1"' "${CONFIG}"
 fi
 
 # Collect IP addresses
@@ -55,7 +53,7 @@ hosts+=($(bashio::network.ipv6_address))
 hosts+=($(bashio::addon.ip_address))
 
 # Add interface to bind to, to AdGuard Home
-yq delete --inplace "${CONFIG}" dns.bind_hosts
+yq --inplace e '.dns.bind_hosts = []' "${CONFIG}"
 for host in "${hosts[@]}"; do
     # Empty host value? Skip it
     if ! bashio::var.has_value "${host}"; then
@@ -84,7 +82,7 @@ for host in "${hosts[@]}"; do
       fi
     fi
 
-    yq write --inplace "${CONFIG}" \
-        dns.bind_hosts[+] "${host%/*}" \
+    host="${host}" yq --inplace e \
+      '.dns.bind_hosts += [env(host)]' "${CONFIG}" \
         || bashio::exit.nok 'Failed updating AdGuardHome host'
 done