mirror of
https://github.com/uklans/cache-domains
synced 2025-09-17 06:38:25 +02:00
fix: ability to use default cache in scripts (#274)
This commit is contained in:
parent
098c1e9c54
commit
170c0905e4
@ -12,3 +12,4 @@ indent_size = 0
|
||||
|
||||
[*.sh]
|
||||
indent_style = tab
|
||||
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user