EvergreenCrypto/docker-finance
1
1
Fork 1
Code Issues 31 Pull Requests Actions Releases 10 Activity

client: lib_env: change docker-finance.d to conf.d

Browse Source
This commit is contained in:
Aaron Fiore
2026-02-17 16:28:39 -08:00
parent 03f43f407f
commit dd66992932
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
client/src/docker/lib/internal/lib_env.bash
View File

@@ -87,7 +87,10 @@ function lib_env::env()
global_tag_dir="client/$(uname -s)-$(uname -m)/${global_platform}/${global_tag}" global_tag_dir="client/$(uname -s)-$(uname -m)/${global_platform}/${global_tag}"
declare -g global_tag_dir 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}" local _env_file="${_env_dir}/${global_conf_filename}"
# shellcheck source=/dev/null # shellcheck source=/dev/null
@@ -95,7 +98,7 @@ function lib_env::env()
if [ -z "$DOCKER_FINANCE_CLIENT_CONF" ]; then if [ -z "$DOCKER_FINANCE_CLIENT_CONF" ]; then
# shellcheck source=/dev/null # 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 fi
[ -z "$DOCKER_FINANCE_CLIENT_CONF" ] \ [ -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}" lib_utils::print_debug "DOCKER_FINANCE_VERSION=${DOCKER_FINANCE_VERSION}"
# Repository-provided (not user-defined) default environment # 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 declare -g global_repo_conf_dir
lib_utils::print_debug "global_repo_conf_dir=${global_repo_conf_dir}" lib_utils::print_debug "global_repo_conf_dir=${global_repo_conf_dir}"