avm/hassio-addons
1
0
Fork 0
mirror of https://github.com/alexbelgium/hassio-addons.git synced 2026-08-02 19:30:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: emit addon options before env_vars so env_vars can override them

Browse Source
This commit is contained in:
Alexandre
2026-05-18 11:55:11 +02:00
parent 86e7f97d87
commit 326c39f8e8
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
.templates/00-global_var.sh
View File

@@ -180,6 +180,7 @@ export_var() {
################################################################################ ################################################################################
# JSON parsing (jq bug fixed: use "? //", not "?//") # JSON parsing (jq bug fixed: use "? //", not "?//")
# Order: 1) top-level addon options first, 2) env_vars second (can override)
################################################################################ ################################################################################
while IFS= read -r -d $'\0' k && IFS= read -r v; do while IFS= read -r -d $'\0' k && IFS= read -r v; do
export_var "$k" "$v" export_var "$k" "$v"
@@ -189,7 +190,15 @@ done < <(
. as $root . as $root
| ( | (
# 1) env_vars[] (supported shapes) # 1) top-level scalar options excluding env_vars (processed first)
$root
| to_entries[]
| select(.key != "env_vars")
| select((.value|type) != "object" and (.value|type) != "array" and (.value|type) != "null")
| emit(.key; .value)
),
(
# 2) env_vars[] (processed second, overrides addon options if same key)
($root.env_vars? // [])[] as $e ($root.env_vars? // [])[] as $e
| if ($e|type) == "object" then | if ($e|type) == "object" then
if ($e|has("name") and has("value")) then if ($e|has("name") and has("value")) then
@@ -205,14 +214,6 @@ done < <(
| emit($m.k; $m.v) | emit($m.k; $m.v)
else empty end else empty end
end end
),
(
# 2) top-level scalar options excluding env_vars
$root
| to_entries[]
| select(.key != "env_vars")
| select((.value|type) != "object" and (.value|type) != "array" and (.value|type) != "null")
| emit(.key; .value)
) )
' "$JSONSOURCE" ' "$JSONSOURCE"
) )