From 00b54ce057c21473268f8edc2f7dffdac5daaf9a Mon Sep 17 00:00:00 2001 From: bfren Date: Thu, 5 Mar 2026 12:06:08 +0000 Subject: [PATCH 1/3] Bumping version to 8.1.7 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index dd9a10b6..5f82703f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -8.1.6 \ No newline at end of file +8.1.7 \ No newline at end of file From e90a07a01615d6251de2dfb80e5ab53aeead7384 Mon Sep 17 00:00:00 2001 From: bfren Date: Thu, 5 Mar 2026 12:06:26 +0000 Subject: [PATCH 2/3] Return empty record instead of nothing --- overlay/etc/nu/scripts/bf-nginx-php/ini.nu | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/overlay/etc/nu/scripts/bf-nginx-php/ini.nu b/overlay/etc/nu/scripts/bf-nginx-php/ini.nu index 7ec3663b..b0c21802 100644 --- a/overlay/etc/nu/scripts/bf-nginx-php/ini.nu +++ b/overlay/etc/nu/scripts/bf-nginx-php/ini.nu @@ -6,8 +6,8 @@ export def get_override_values []: nothing -> record { let ini_override = bf env PHP_INI_OVERRIDE_D # if the override path does not exist return nothing - if not ($ini_override | path exists) { - return + if ($ini_override | bf fs is_not_dir) { + return {} } # load override json files, From 775d43288f7917ab20198ccb165fdd3d86591ac7 Mon Sep 17 00:00:00 2001 From: bfren Date: Thu, 5 Mar 2026 12:11:53 +0000 Subject: [PATCH 3/3] Correcting pipeline over newlines --- overlay/etc/nu/scripts/bf-nginx-php/ini.nu | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/overlay/etc/nu/scripts/bf-nginx-php/ini.nu b/overlay/etc/nu/scripts/bf-nginx-php/ini.nu index b0c21802..57327a17 100644 --- a/overlay/etc/nu/scripts/bf-nginx-php/ini.nu +++ b/overlay/etc/nu/scripts/bf-nginx-php/ini.nu @@ -14,12 +14,15 @@ export def get_override_values []: nothing -> record { # sorted alphabetically # read as json # reduce array so later values override earlier values - return $"($ini_override)/*.json" + let override_values = $"($ini_override)/*.json" | into glob | ls --full-paths $in | get name | sort --natural | each {|x| bf fs read $x | from json } | reduce {|it, acc| $acc | merge $it } + | sort --natural | into record + + return $override_values }