diff --git a/VERSION b/VERSION index dd9a10b..5f82703 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 diff --git a/overlay/etc/nu/scripts/bf-nginx-php/ini.nu b/overlay/etc/nu/scripts/bf-nginx-php/ini.nu index 7ec3663..57327a1 100644 --- a/overlay/etc/nu/scripts/bf-nginx-php/ini.nu +++ b/overlay/etc/nu/scripts/bf-nginx-php/ini.nu @@ -6,20 +6,23 @@ 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, # 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 }