Compare commits

...

2 Commits

Author SHA1 Message Date
0kgjv
b461d513b7
Merge 3cfdf1b5be into 170c0905e4 2025-08-19 17:34:11 +08:00
Amir Zarrinkafsh
170c0905e4
fix: ability to use default cache in scripts (#274) 2025-08-16 21:05:58 +01:00
6 changed files with 7 additions and 13 deletions

View File

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

View File

@ -13,7 +13,6 @@ if ! command -v jq >/dev/null; then
exit 1
fi
cachenamedefault="disabled"
combinedoutput=$(jq -r ".combined_output" config.json)
while read -r line; do
@ -34,7 +33,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

View File

@ -13,7 +13,6 @@ if ! command -v jq >/dev/null; then
exit 1
fi
cachenamedefault="disabled"
combinedoutput=$(jq -r ".combined_output" config.json)
while read -r line; do
@ -34,7 +33,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

View File

@ -14,8 +14,6 @@ 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}"
@ -50,7 +48,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

View File

@ -14,8 +14,6 @@ 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}"
@ -28,7 +26,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

View File

@ -13,7 +13,6 @@ if ! command -v jq >/dev/null; then
exit 1
fi
cachenamedefault="disabled"
combinedoutput=$(jq -r ".combined_output" config.json)
while read -r line; do
@ -34,7 +33,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