From 52270ba0b38c1f39fadd528aabb74c255d1124eb Mon Sep 17 00:00:00 2001 From: Aaron Fiore Date: Sun, 22 Sep 2024 18:36:03 -0700 Subject: [PATCH] container: rename $global_conf_shell -> $global_conf_subscript Provides clarity, avoids confusion. --- container/plugins/root/example.cc | 2 +- container/src/finance/lib/internal/lib_edit.bash | 6 +++--- container/src/finance/lib/lib_finance.bash | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/container/plugins/root/example.cc b/container/plugins/root/example.cc index a6cfa08..23b0248 100644 --- a/container/plugins/root/example.cc +++ b/container/plugins/root/example.cc @@ -96,7 +96,7 @@ void example2() print_env("global_conf_fetch"); print_env("global_conf_hledger"); print_env("global_conf_meta"); - print_env("global_conf_shell"); + print_env("global_conf_subscript"); // TODO(unassigned): read array from shell? ROOT impl simply calls stdlib getenv() // print_env("global_hledger_cmd"); print_env("global_parent_profile"); diff --git a/container/src/finance/lib/internal/lib_edit.bash b/container/src/finance/lib/internal/lib_edit.bash index 36e02f4..5a3b87a 100644 --- a/container/src/finance/lib/internal/lib_edit.bash +++ b/container/src/finance/lib/internal/lib_edit.bash @@ -324,14 +324,14 @@ function lib_edit::__edit() $EDITOR "${_paths[@]}" || lib_utils::die_fatal ;; shell) - [ -z "$global_conf_shell" ] && lib_utils::die_fatal + [ -z "$global_conf_subscript" ] && lib_utils::die_fatal local _dir - _dir="$(dirname $global_conf_shell)" + _dir="$(dirname $global_conf_subscript)" [ ! -d "$_dir" ] && mkdir -p "$_dir" local _file - _file="$(basename $global_conf_shell)" + _file="$(basename $global_conf_subscript)" local _path _path="${_dir}/${_file}" diff --git a/container/src/finance/lib/lib_finance.bash b/container/src/finance/lib/lib_finance.bash index df3f942..cabbc68 100644 --- a/container/src/finance/lib/lib_finance.bash +++ b/container/src/finance/lib/lib_finance.bash @@ -80,7 +80,7 @@ function lib_finance::finance() declare -grx global_conf_fetch="${global_child_profile_flow}/docker-finance.d/fetch/fetch.yaml" declare -grx global_conf_hledger="${global_child_profile_flow}/docker-finance.d/hledger/hledger.conf" declare -grx global_conf_meta="${global_child_profile_flow}/docker-finance.d/meta/meta.csv" - declare -grx global_conf_shell="${global_child_profile_flow}/docker-finance.d/shell/subscript.bash" + declare -grx global_conf_subscript="${global_child_profile_flow}/docker-finance.d/shell/subscript.bash" # Implementation "libraries" (requires previously set globals) source "${DOCKER_FINANCE_CONTAINER_REPO}/src/finance/lib/internal/lib_edit.bash" || exit 1