Compare commits
3 Commits
main
...
fix/p1b-ev
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a4e2d2c4c7 | ||
|
|
02f70dd065 | ||
|
|
3fc5d517cd |
@ -65,7 +65,7 @@ function apply_cmdline_params_to_env() {
|
|||||||
if [[ -z "${!param_name+x}" ]] || [[ "${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"
|
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.
|
# use `declare -g` to make it global, we're in a function.
|
||||||
eval "declare -g $param_name=\"$param_value\""
|
declare -g "${param_name}=${param_value}"
|
||||||
else
|
else
|
||||||
# rpardini: strategic amount of spacing in log files show the kinda neuroticism that drives me.
|
# rpardini: strategic amount of spacing in log files show the kinda neuroticism that drives me.
|
||||||
display_alert "Skip cmdline param" "'$param_name': already set to '${param_value_desc}' ${__my_reason}" "info"
|
display_alert "Skip cmdline param" "'$param_name': already set to '${param_value_desc}' ${__my_reason}" "info"
|
||||||
|
|||||||
@ -18,7 +18,13 @@ function track_config_variables() {
|
|||||||
|
|
||||||
# if the var is an array...
|
# if the var is an array...
|
||||||
if [[ "${array_values:-"no"}" == "yes" ]]; then
|
if [[ "${array_values:-"no"}" == "yes" ]]; then
|
||||||
eval "var_value=\"\${${var_name}[@]}\"" # sorry
|
# bash nameref (local -n) creates an alias for the variable named in $var_name —
|
||||||
|
# no eval needed, no code-injection risk. Works for arrays and scalars alike.
|
||||||
|
# unset -n removes the alias only (not the referenced array) to avoid
|
||||||
|
# "already a nameref" warnings on the next loop iteration.
|
||||||
|
local -n _ct_arr_ref="${var_name}"
|
||||||
|
var_value="${_ct_arr_ref[*]}"
|
||||||
|
unset -n _ct_arr_ref
|
||||||
value_text="${blue_color:-}(${bright_blue_color:-}${var_value}${blue_color:-})"
|
value_text="${blue_color:-}(${bright_blue_color:-}${var_value}${blue_color:-})"
|
||||||
else
|
else
|
||||||
var_value="${!var_name}"
|
var_value="${!var_name}"
|
||||||
|
|||||||
@ -30,8 +30,8 @@ function interactive_config_prepare_terminal() {
|
|||||||
# $1: variable name
|
# $1: variable name
|
||||||
# $2: variable value
|
# $2: variable value
|
||||||
function set_interactive_config_value() {
|
function set_interactive_config_value() {
|
||||||
eval "$1"='$2'
|
declare -g "${1}=${2}"
|
||||||
eval "ARMBIAN_INTERACTIVE_CONFIGS[${1}]"='$2'
|
ARMBIAN_INTERACTIVE_CONFIGS["${1}"]="${2}"
|
||||||
}
|
}
|
||||||
|
|
||||||
function interactive_finish() {
|
function interactive_finish() {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user