From dd66992932f838aac75e8b1214b3383dfc1467db Mon Sep 17 00:00:00 2001 From: Aaron Fiore Date: Tue, 17 Feb 2026 16:28:39 -0800 Subject: [PATCH] client: lib_env: change `docker-finance.d` to `conf.d` --- client/src/docker/lib/internal/lib_env.bash | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/client/src/docker/lib/internal/lib_env.bash b/client/src/docker/lib/internal/lib_env.bash index 927e8e0..56a0ddc 100644 --- a/client/src/docker/lib/internal/lib_env.bash +++ b/client/src/docker/lib/internal/lib_env.bash @@ -87,7 +87,10 @@ function lib_env::env() global_tag_dir="client/$(uname -s)-$(uname -m)/${global_platform}/${global_tag}" declare -g global_tag_dir - local _env_dir="/home/${USER}/.config/docker-finance.d/${global_tag_dir}/env" # NOTE: keep aligned with gen.bash + # Environment location + # NOTE: keep aligned with gen.bash + local _env_dir + _env_dir="$(dirname "$(realpath -s $0)" | rev | cut -d'/' -f3- | rev)/conf.d/${global_tag_dir}/env" local _env_file="${_env_dir}/${global_conf_filename}" # shellcheck source=/dev/null @@ -95,7 +98,7 @@ function lib_env::env() if [ -z "$DOCKER_FINANCE_CLIENT_CONF" ]; then # shellcheck source=/dev/null - source "${DOCKER_FINANCE_CLIENT_REPO}/client/docker-finance.d/client/env/gen.bash" + source "${DOCKER_FINANCE_CLIENT_REPO}/client/conf.d/client/env/gen.bash" fi [ -z "$DOCKER_FINANCE_CLIENT_CONF" ] \ @@ -163,7 +166,7 @@ function lib_env::__set_client_globals() lib_utils::print_debug "DOCKER_FINANCE_VERSION=${DOCKER_FINANCE_VERSION}" # Repository-provided (not user-defined) default environment - global_repo_conf_dir="${DOCKER_FINANCE_CLIENT_REPO}/client/docker-finance.d" + global_repo_conf_dir="${DOCKER_FINANCE_CLIENT_REPO}/client/conf.d" declare -g global_repo_conf_dir lib_utils::print_debug "global_repo_conf_dir=${global_repo_conf_dir}"