enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bugfix: Allow to set empty cmdline params

Browse Source 
Fix the following error:
  [🌱] Skip     cmdline param [ 'DESKTOP_APPGROUPS_SELECTED': already set to '(empty)' early ]
This commit is contained in:
hzy 2023-03-24 19:24:57 +08:00 committed by Igor Pečovnik
parent 5930e5e536
commit 26b8642804
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/functions/cli/utils-cli.sh
View File

@ -55,13 +55,14 @@ function apply_cmdline_params_to_env() {
local param_value param_value_desc current_env_value
# get the current value from the environment
current_env_value="${!param_name}"
current_env_value_desc="${current_env_value:-(empty)}"
current_env_value_desc="${!param_name-(unset)}"
current_env_value_desc="${current_env_value_desc:-(empty)}"
# get the new value from the dictionary
param_value="${ARMBIAN_PARSED_CMDLINE_PARAMS[${param_name}]}"
param_value_desc="${param_value:-(empty)}"
# Compare, log, and apply.
if [[ "${current_env_value}" != "${param_value}" ]]; then
if [[ -z "${!param_name+x}" ]] || [[ "${current_env_value}" != "${param_value}" ]]; then
display_alert "Applying cmdline param" "'$param_name': '${current_env_value_desc}' --> '${param_value_desc}' ${__my_reason}" "cmdline"
# use `declare -g` to make it global, we're in a function.
eval "declare -g $param_name=\"$param_value\""