From 0ec42d242093fe15f47ca4340582259a45d090d9 Mon Sep 17 00:00:00 2001 From: Aaron Fiore Date: Sun, 22 Sep 2024 18:35:44 -0700 Subject: [PATCH] client: rename $global_shell_file -> $global_superscript Provides clarity, avoids confusion. --- .../src/docker/lib/internal/lib_docker.bash | 10 ++++---- client/src/docker/lib/internal/lib_env.bash | 4 ++-- client/src/docker/lib/internal/lib_gen.bash | 24 +++++++++---------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/client/src/docker/lib/internal/lib_docker.bash b/client/src/docker/lib/internal/lib_docker.bash index 9a3d3ae..15cde64 100644 --- a/client/src/docker/lib/internal/lib_docker.bash +++ b/client/src/docker/lib/internal/lib_docker.bash @@ -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 diff --git a/client/src/docker/lib/internal/lib_env.bash b/client/src/docker/lib/internal/lib_env.bash index ef09ad2..e957cf7 100644 --- a/client/src/docker/lib/internal/lib_env.bash +++ b/client/src/docker/lib/internal/lib_env.bash @@ -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" diff --git a/client/src/docker/lib/internal/lib_gen.bash b/client/src/docker/lib/internal/lib_gen.bash index 0f2ba68..e59ffd8 100644 --- a/client/src/docker/lib/internal/lib_gen.bash +++ b/client/src/docker/lib/internal/lib_gen.bash @@ -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" } #