mirror of
https://github.com/blakeblackshear/frigate.git
synced 2025-12-06 13:34:13 +03:00
Rename conflicting bash variables (#20276)
Some checks are pending
CI / AMD64 Build (push) Waiting to run
CI / ARM Build (push) Waiting to run
CI / Jetson Jetpack 6 (push) Waiting to run
CI / AMD64 Extra Build (push) Blocked by required conditions
CI / ARM Extra Build (push) Blocked by required conditions
CI / Synaptics Build (push) Blocked by required conditions
CI / Assemble and push default build (push) Blocked by required conditions
Some checks are pending
CI / AMD64 Build (push) Waiting to run
CI / ARM Build (push) Waiting to run
CI / Jetson Jetpack 6 (push) Waiting to run
CI / AMD64 Extra Build (push) Blocked by required conditions
CI / ARM Extra Build (push) Blocked by required conditions
CI / Synaptics Build (push) Blocked by required conditions
CI / Assemble and push default build (push) Blocked by required conditions
In bash you cannot redeclare a readonly variable as local, even within a function scope
This commit is contained in:
parent
bebe99d9b8
commit
8b85cd816e
@ -51,16 +51,16 @@ function set_libva_version() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function setup_homekit_config() {
|
function setup_homekit_config() {
|
||||||
local homekit_config_path="$1"
|
local config_path="$1"
|
||||||
|
|
||||||
if [[ ! -f "${homekit_config_path}" ]]; then
|
if [[ ! -f "${config_path}" ]]; then
|
||||||
echo "[INFO] Creating empty HomeKit config file..."
|
echo "[INFO] Creating empty HomeKit config file..."
|
||||||
echo '{}' > "${homekit_config_path}"
|
echo '{}' > "${config_path}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Convert YAML to JSON for jq processing
|
# Convert YAML to JSON for jq processing
|
||||||
local temp_json="/tmp/cache/homekit_config.json"
|
local temp_json="/tmp/cache/homekit_config.json"
|
||||||
yq eval -o=json "${homekit_config_path}" > "${temp_json}" 2>/dev/null || {
|
yq eval -o=json "${config_path}" > "${temp_json}" 2>/dev/null || {
|
||||||
echo "[WARNING] Failed to convert HomeKit config to JSON, skipping cleanup"
|
echo "[WARNING] Failed to convert HomeKit config to JSON, skipping cleanup"
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
@ -73,9 +73,9 @@ function setup_homekit_config() {
|
|||||||
' "${temp_json}" > "${cleaned_json}" 2>/dev/null || echo '{"homekit": {}}' > "${cleaned_json}"
|
' "${temp_json}" > "${cleaned_json}" 2>/dev/null || echo '{"homekit": {}}' > "${cleaned_json}"
|
||||||
|
|
||||||
# Convert back to YAML and write to the config file
|
# Convert back to YAML and write to the config file
|
||||||
yq eval -P "${cleaned_json}" > "${homekit_config_path}" 2>/dev/null || {
|
yq eval -P "${cleaned_json}" > "${config_path}" 2>/dev/null || {
|
||||||
echo "[WARNING] Failed to convert cleaned config to YAML, creating minimal config"
|
echo "[WARNING] Failed to convert cleaned config to YAML, creating minimal config"
|
||||||
echo '{"homekit": {}}' > "${homekit_config_path}"
|
echo '{"homekit": {}}' > "${config_path}"
|
||||||
}
|
}
|
||||||
|
|
||||||
# Clean up temp files
|
# Clean up temp files
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user