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

client: src: lib_gen: refactor/update editor related

Browse Source 
- Creates a reusable editor function
- Skipping confirmations will also skip opening up the editor
  * Allows for complete generation without intentional interruption
This commit is contained in:
Aaron Fiore
2024-09-22 18:36:30 -07:00
parent 52270ba0b3
commit 169034cbe2
1 changed files with 26 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -395,7 +395,6 @@ function lib_gen::gen()
function lib_gen::__gen_client()
{
[ -z "$global_suffix" ] && lib_utils::die_fatal
[ -z "$EDITOR" ] && lib_utils::die_fatal
lib_utils::print_debug "Generating client"
@@ -430,10 +429,7 @@ function lib_gen::__gen_client()
fi
lib_utils::print_custom " \e[32m│ └─\e[34m Edit (new) environment 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_env_file"
lib_gen::__gen_edit "$global_env_file"
# Get/Set new (edited) environment variables
lib_env::__read "$global_env_file"
@@ -472,10 +468,7 @@ function lib_gen::__gen_client()
fi
lib_utils::print_custom " \e[32m│ └─\e[34m Edit (new) custom Dockerfile 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_custom_dockerfile" || return 0
lib_gen::__gen_edit "$global_custom_dockerfile"
fi
}
@@ -571,11 +564,9 @@ function lib_gen::__gen_superscript()
lib_gen::__gen_superscript_write
local _print_custom=" \e[32m│ │ └─\e[34m Edit (new) superscript now? [Y/n] \e[0m"
fi
lib_utils::print_custom "$_print_custom"
[ -z "$global_arg_confirm" ] && lib_utils::print_custom "\n" || read -p "" _read
local _confirm="${_read:-y}"
[[ "$_confirm" == [yY] || -z "$global_arg_confirm" ]] && $EDITOR "$global_superscript"
lib_utils::print_custom "$_print_custom"
lib_gen::__gen_edit "$global_superscript"
}
function lib_gen::__gen_superscript_write()
@@ -843,9 +834,7 @@ function lib_gen::__gen_subprofile_flow_subscript()
fi
lib_utils::print_custom "$_print_custom"
[ -z "$global_arg_confirm" ] && lib_utils::print_custom "\n" || read -p "" _read
_confirm="${_read:-y}"
[[ "$_confirm" == [yY] || -z "$global_arg_confirm" ]] && $EDITOR "$_file"
lib_gen::__gen_edit "$_file"
}
function lib_gen::__gen_subprofile_flow_subscript_write()
@@ -886,9 +875,7 @@ function lib_gen::__gen_subprofile_flow_superscript()
|| 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_superscript"
lib_gen::__gen_edit "$global_superscript"
}
#
@@ -920,9 +907,7 @@ function lib_gen::__gen_subprofile_flow_fetch()
fi
lib_utils::print_custom "$_print_custom"
[ -z "$global_arg_confirm" ] && lib_utils::print_custom "\n" || read -p "" _read
_confirm="${_read:-y}"
[[ "$_confirm" == [yY] || -z "$global_arg_confirm" ]] && $EDITOR "$_file"
lib_gen::__gen_edit "$_file"
}
function lib_gen::__gen_subprofile_flow_fetch_write()
@@ -969,9 +954,7 @@ function lib_gen::__gen_subprofile_flow_meta()
fi
lib_utils::print_custom "$_print_custom"
[ -z "$global_arg_confirm" ] && lib_utils::print_custom "\n" || read -p "" _read
_confirm="${_read:-y}"
[[ "$_confirm" == [yY] || -z "$global_arg_confirm" ]] && $EDITOR "$_file"
lib_gen::__gen_edit "$_file"
}
function lib_gen::__gen_subprofile_flow_meta_write()
@@ -1017,9 +1000,7 @@ function lib_gen::__gen_subprofile_flow_hledger()
fi
lib_utils::print_custom "$_print_custom"
[ -z "$global_arg_confirm" ] && lib_utils::print_custom "\n" || read -p "" _read
_confirm="${_read:-y}"
[[ "$_confirm" == [yY] || -z "$global_arg_confirm" ]] && $EDITOR "$_file"
lib_gen::__gen_edit "$_file"
}
function lib_gen::__gen_subprofile_flow_hledger_write()
@@ -1149,4 +1130,21 @@ function lib_gen::__gen_subprofile_flow_accounts_populate()
fi
}
function lib_gen::__gen_edit()
{
local _file="$1"
[[ -z "$_file" || ! -f "$_file" ]] && lib_utils::die_fatal
if [ -z "$global_arg_confirm" ]; then
lib_utils::print_custom "\n"
_read="n"
else
read -p "" _read
fi
local _confirm="${_read:-y}"
[ -z "$EDITOR" ] && lib_utils::die_fatal
[[ "$_confirm" == [yY] ]] && $EDITOR "$_file" || return 0
}
# vim: sw=2 sts=2 si ai et