client: fix base path location deduction when sourced
- Since these files are only ever sourced, deduction must be relative to `BASH_SOURCE` - Fixes client-side completion (realpath breakage)
This commit is contained in:
2
client/conf.d/client/env/gen.bash
vendored
2
client/conf.d/client/env/gen.bash
vendored
@@ -67,7 +67,7 @@ fi
|
||||
# Client-specific environment, including bind mounts (client view)
|
||||
|
||||
if [ -z "$global_client_base_path" ]; then
|
||||
global_client_base_path="$(dirname "$(realpath -s $0)" | rev | cut -d'/' -f3- | rev)"
|
||||
global_client_base_path="$(dirname $(realpath -s "$BASH_SOURCE" | rev | cut -d'/' -f6- | rev))"
|
||||
fi
|
||||
|
||||
if [ -z "$DOCKER_FINANCE_CLIENT_CONF" ]; then
|
||||
|
||||
@@ -90,7 +90,7 @@ function lib_env::env()
|
||||
# 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"
|
||||
_env_dir="$(dirname $(realpath -s "$BASH_SOURCE" | rev | cut -d'/' -f6- | rev))/conf.d/${global_tag_dir}/env"
|
||||
local _env_file="${_env_dir}/${global_conf_filename}"
|
||||
|
||||
# shellcheck source=/dev/null
|
||||
|
||||
Reference in New Issue
Block a user