Merge 27f066bb8b into 098c1e9c54

.editorconfig

@@ -11,5 +11,4 @@ insert_final_newline = true
 indent_size = 0
 
 [*.sh]
-indent_style = tab
-
+indent_style = tab

scripts/create-adguardhome.sh

@@ -13,6 +13,7 @@ if ! command -v jq >/dev/null; then
 	exit 1
 fi
 
+cachenamedefault="disabled"
 combinedoutput=$(jq -r ".combined_output" config.json)
 
 while read -r line; do
@@ -33,7 +34,7 @@ while read -r entry; do
 	key=$(jq -r ".cache_domains[$entry].name" ${path})
 	cachename="cachename${key}"
 	if [ -z "${!cachename}" ]; then
-		cachename="cachenamedefault"
+		cachename=${cachenamedefault}
 	fi
 	if [[ ${cachename} == "disabled" ]]; then
 		continue

scripts/create-dnsmasq.sh

@@ -13,6 +13,7 @@ if ! command -v jq >/dev/null; then
 	exit 1
 fi
 
+cachenamedefault="disabled"
 combinedoutput=$(jq -r ".combined_output" config.json)
 
 while read -r line; do
@@ -33,7 +34,7 @@ while read -r entry; do
 	key=$(jq -r ".cache_domains[${entry}].name" ${path})
 	cachename="cachename${key}"
 	if [ -z "${!cachename}" ]; then
-		cachename="cachenamedefault"
+		cachename=${cachenamedefault}
 	fi
 	if [[ ${cachename} == "disabled" ]]; then
 		continue

scripts/create-rpz.sh

@@ -14,6 +14,8 @@ if ! command -v jq >/dev/null; then
 	exit 1
 fi
 
+cachenamedefault="disabled"
+
 while read -r line; do
 	ip=$(jq ".ips[\"${line}\"]" config.json)
 	declare "cacheip${line}"="${ip}"
@@ -48,7 +50,7 @@ while read -r entry; do
 	key=$(jq -r ".cache_domains[${entry}].name" ${path})
 	cachename="cachename${key}"
 	if [ -z "${!cachename}" ]; then
-		cachename="cachenamedefault"
+		cachename=${cachenamedefault}
 	fi
 	if [[ ${cachename} == "disabled" ]]; then
 		continue

scripts/create-squid.sh

@@ -14,6 +14,8 @@ if ! command -v jq >/dev/null; then
 	exit 1
 fi
 
+cachenamedefault="disabled"
+
 while read -r line; do
 	name=$(jq -r ".cache_domains[\"${line}\"]" config.json)
 	declare "cachename${line}"="${name}"
@@ -26,7 +28,7 @@ while read -r entry; do
 	key=$(jq -r ".cache_domains[$entry].name" ${path})
 	cachename="cachename${key}"
 	if [ -z "${!cachename}" ]; then
-		cachename="cachenamedefault"
+		cachename=${cachenamedefault}
 	fi
 	if [[ ${cachename} == "disabled" ]]; then
 		continue

scripts/create-unbound.sh

@@ -13,6 +13,7 @@ if ! command -v jq >/dev/null; then
 	exit 1
 fi
 
+cachenamedefault="disabled"
 combinedoutput=$(jq -r ".combined_output" config.json)
 
 while read -r line; do
@@ -33,7 +34,7 @@ while read -r entry; do
 	key=$(jq -r ".cache_domains[${entry}].name" ${path})
 	cachename="cachename${key}"
 	if [ -z "${!cachename}" ]; then
-		cachename="cachenamedefault"
+		cachename=${cachenamedefault}
 	fi
 	if [[ ${cachename} == "disabled" ]]; then
 		continue