AaronFiore/docker-finance
1
0
Fork 0
forked from EvergreenCrypto/docker-finance
Code Activity

client: rename $global_shell_file -> $global_superscript

Browse Source 
Provides clarity, avoids confusion.
This commit is contained in:
Aaron Fiore
2024-09-22 18:35:44 -07:00
parent 51bf587ceb
commit 0ec42d2420
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
client/src/docker/lib/internal/lib_docker.bash
View File

@@ -561,11 +561,11 @@ function lib_docker::__edit()
[ -z "$global_env_file" ] && lib_utils::die_fatal
[ ! -f "$global_env_file" ] \
&& lib_utils::die_fatal "Environment file now found"
&& lib_utils::die_fatal "Environment file not found"
[ -z "$global_shell_file" ] && lib_utils::die_fatal
[ ! -f "$global_shell_file" ] \
&& lib_utils::die_fatal "Shell (superscript) file now found"
[ -z "$global_superscript" ] && lib_utils::die_fatal
[ ! -f "$global_superscript" ] \
&& lib_utils::die_fatal "Shell (superscript) file not found"
# Run all files through one editor instance
local _paths=()
@@ -581,7 +581,7 @@ function lib_docker::__edit()
[[ "$global_platform" == "dev-tools" ]] \
&& lib_utils::die_fatal "Invalid platform, use finance image"
_paths+=("$global_shell_file")
_paths+=("$global_superscript")
;;
build | dockerfile)
[ -z "$global_custom_dockerfile" ] && lib_utils::die_fatal

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

@@ -240,8 +240,8 @@ function lib_env::__set_client_globals()
local _client_shell_dir="${DOCKER_FINANCE_CLIENT_CONF}/container/shell"
[ ! -d "$_client_shell_dir" ] && mkdir -p "$_client_shell_dir"
global_shell_file="${_client_shell_dir}/superscript.bash"
lib_utils::print_debug "global_shell_file=${global_shell_file}"
global_superscript="${_client_shell_dir}/superscript.bash"
lib_utils::print_debug "global_superscript=${global_superscript}"
# Client view of client portion of repository
global_repo_client="${DOCKER_FINANCE_CLIENT_REPO}/client"

24
client/src/docker/lib/internal/lib_gen.bash
View File

@@ -549,9 +549,9 @@ function lib_gen::__gen_container()
function lib_gen::__gen_superscript()
{
[ -z "$global_shell_file" ] && lib_utils::die_fatal
[ -z "$global_superscript" ] && lib_utils::die_fatal
if [ -f "$global_shell_file" ]; then
if [ -f "$global_superscript" ]; then
lib_utils::print_custom " \e[32m│ └─\e[34m Backup existing superscript and generate a new one? [N/y] \e[0m"
[ -z "$global_arg_confirm" ] && lib_utils::print_custom "\n" || read -p "" _read
@@ -559,7 +559,7 @@ function lib_gen::__gen_superscript()
if [[ "$_confirm" == [yY] || -z "$global_arg_confirm" ]]; then
# Backup
local -r _backup=("cp" "-a" "$global_shell_file" "${global_shell_file}_${global_suffix}")
local -r _backup=("cp" "-a" "$global_superscript" "${global_superscript}_${global_suffix}")
lib_utils::print_debug "${_backup[@]}"
"${_backup[@]}" || lib_utils::die_fatal
# Write
@@ -575,7 +575,7 @@ function lib_gen::__gen_superscript()
[ -z "$global_arg_confirm" ] && lib_utils::print_custom "\n" || read -p "" _read
local _confirm="${_read:-y}"
[[ "$_confirm" == [yY] || -z "$global_arg_confirm" ]] && $EDITOR "$global_shell_file"
[[ "$_confirm" == [yY] || -z "$global_arg_confirm" ]] && $EDITOR "$global_superscript"
}
function lib_gen::__gen_superscript_write()
@@ -586,12 +586,12 @@ function lib_gen::__gen_superscript_write()
[ -z "$global_client_version" ] && lib_utils::die_fatal
lib_utils::print_debug "global_client_version=${global_client_version}"
[ -z "$global_shell_file" ] && lib_utils::die_fatal
lib_utils::print_debug "global_shell_file=${global_shell_file}"
[ -z "$global_superscript" ] && lib_utils::die_fatal
lib_utils::print_debug "global_superscript=${global_superscript}"
sed \
-e "s:@DOCKER_FINANCE_VERSION@:${global_client_version}:g" \
"${global_repo_conf_dir}/container/shell/superscript.bash.in" >"$global_shell_file"
"${global_repo_conf_dir}/container/shell/superscript.bash.in" >"$global_superscript"
}
#
@@ -874,21 +874,21 @@ function lib_gen::__gen_subprofile_flow_superscript()
{
[[ -z "$_profile" || -z "$_subprofile" ]] && lib_utils::die_fatal
[ -z "$global_shell_file" ] && lib_utils::die_fatal
[ ! -f "$global_shell_file" ] && lib_utils::die_fatal "Superscript does not exist!"
[ -z "$global_superscript" ] && lib_utils::die_fatal
[ ! -f "$global_superscript" ] && lib_utils::die_fatal "Superscript does not exist!"
# Append subprofile source to superscript
local -r _source="source \"\${DOCKER_FINANCE_CONTAINER_FLOW}/profiles/${_profile}/${_subprofile}/docker-finance.d/shell/subscript.bash\""
lib_utils::print_custom " \e[32m│ │ │ └─\e[34m Appending subprofile to superscript\e[0m\n"
# If source subprofile does not exist, append
grep "$_source" "$global_shell_file" >&/dev/null \
|| sed -i "$(wc -l <$global_shell_file)i\\$_source\\" "$global_shell_file"
grep "$_source" "$global_superscript" >&/dev/null \
|| sed -i "$(wc -l <$global_superscript)i\\$_source\\" "$global_superscript"
lib_utils::print_custom " \e[32m│ │ │ └─\e[34m Edit superscript now? [Y/n] \e[0m"
[ -z "$global_arg_confirm" ] && lib_utils::print_custom "\n" || read -p "" _read
local _confirm="${_read:-y}"
[[ "$_confirm" == [yY] || -z "$global_arg_confirm" ]] && $EDITOR "$global_shell_file"
[[ "$_confirm" == [yY] || -z "$global_arg_confirm" ]] && $EDITOR "$global_superscript"
}
#