From 9f6ad1911255cb227402262b2e74b6f17288d893 Mon Sep 17 00:00:00 2001
From: Aaron Fiore <founder@evergreencrypto.co>
Date: Sun, 22 Sep 2024 18:33:48 -0700
Subject: [PATCH] client: src: lib_gen: move hledger conf to subprofile gen

Subprofile's hledger conf should be within subprofile generation.
---
 client/src/docker/lib/internal/lib_gen.bash | 121 +++++++++-----------
 1 file changed, 57 insertions(+), 64 deletions(-)

diff --git a/client/src/docker/lib/internal/lib_gen.bash b/client/src/docker/lib/internal/lib_gen.bash
index ce3afae..eb5934d 100644
--- a/client/src/docker/lib/internal/lib_gen.bash
+++ b/client/src/docker/lib/internal/lib_gen.bash
@@ -294,19 +294,6 @@ function lib_gen::__gen_profile()
     lib_gen::__gen_subprofile_shell "$_gen_path" "$_gen_conf_path"
   fi
 
-  lib_utils::print_custom "    \e[32m│  │\e[0m\n"
-  lib_utils::print_custom "    \e[32m│  ├─\e[34;1m Generate (or update) hledger configuration file? [Y/n] \e[0m"
-  read -p "" _read
-  _confirm="${_read:-y}"
-  if [[ "$_confirm" == [yY] ]]; then
-    local _gen_path="${_profiles}/${_profile}/${_subprofile}" # client's view
-    local _gen_conf_path="${_gen_path}/docker-finance.d"
-    lib_utils::print_debug "_gen_path=${_gen_path}"
-    lib_utils::print_debug "_gen_conf_path=${_gen_conf_path}"
-
-    lib_gen::__gen_subprofile_hledger "$_gen_path" "$_gen_conf_path"
-  fi
-
   lib_utils::print_custom "    \e[32m│  │\e[0m\n"
   lib_utils::print_custom "    \e[32m│  ├─\e[34;1m Generate (or update) container flow configs and/or accounts? [Y/n] \e[0m"
   read -p "" _read
@@ -383,57 +370,6 @@ function lib_gen::__gen_subprofile_shell_write()
     "${global_repo_conf_dir}/container/shell/superscript.bash.in" >"$_file"
 }
 
-#
-# Subprofile: generate hledger configuration file
-#
-
-function lib_gen::__gen_subprofile_hledger()
-{
-  local -r _gen_path="$1"
-  local -r _gen_conf_path="$2"
-
-  local _dir="${_gen_conf_path}/hledger"
-  [ ! -d "$_dir" ] && mkdir -p "$_dir"
-
-  local _file="${_dir}/hledger.conf"
-  if [ -f "$_file" ]; then
-    lib_utils::print_custom "    \e[32m│  │  │  └─\e[34m hledger configuration found, backup then generate new one? [Y/n] \e[0m"
-    read -p "" _read
-    _confirm="${_read:-y}"
-
-    if [[ "$_confirm" == [yY] ]]; then
-      cp -a "$_file" "${_file}_${global_suffix}" || lib_utils::die_fatal
-
-      lib_gen::__gen_subprofile_hledger_write "$_file"
-      local _print_custom="    \e[32m│  │  │     └─\e[34m Edit (new) hledger configuration now? [Y/n] \e[0m"
-    fi
-  else
-    lib_gen::__gen_subprofile_hledger_write "$_file"
-    local _print_custom="    \e[32m│  │  │  └─\e[34m Edit (new) hledger configuration now? [Y/n] \e[0m"
-  fi
-
-  lib_utils::print_custom "$_print_custom"
-  read -p "" _read
-  _confirm="${_read:-y}"
-  [[ "$_confirm" == [yY] ]] && $EDITOR "$_file"
-}
-
-function lib_gen::__gen_subprofile_hledger_write()
-{
-  local _file="$1"
-  [ -z "$_file" ] && lib_utils::die_fatal
-
-  [ -z "$global_repo_conf_dir" ] && lib_utils::die_fatal
-  lib_utils::print_debug "global_repo_conf_dir=${global_repo_conf_dir}"
-
-  [ -z "$global_client_version" ] && lib_utils::die_fatal
-  lib_utils::print_debug "global_client_version=${global_client_version}"
-
-  sed \
-    -e "s:@DOCKER_FINANCE_VERSION@:${global_client_version}:g" \
-    "${global_repo_conf_dir}/container/hledger/hledger.conf.in" >"$_file"
-}
-
 #
 # Subprofile: generate flow
 #
@@ -461,6 +397,12 @@ function lib_gen::__gen_subprofile_flow()
   _confirm="${_read:-y}"
   [[ "$_confirm" == [yY] ]] && lib_gen::__gen_subprofile_flow_meta
 
+  lib_utils::print_custom "    \e[32m│  │  │\e[0m\n"
+  lib_utils::print_custom "    \e[32m│  │  ├─\e[34;1m Generate (or update) subprofile's hledger configuration file? [Y/n] \e[0m"
+  read -p "" _read
+  _confirm="${_read:-y}"
+  [[ "$_confirm" == [yY] ]] && lib_gen::__gen_subprofile_hledger "$_gen_path" "$_gen_conf_path"
+
   lib_utils::print_custom "    \e[32m│  │  │\e[0m\n"
   lib_utils::print_custom "    \e[32m│  │  ├─\e[34;1m Generate (or update) subprofile's hledger-flow accounts? [Y/n] \e[0m"
   read -p "" _read
@@ -615,6 +557,57 @@ function lib_gen::__gen_subprofile_flow_meta_write()
     "${global_repo_conf_dir}/container/meta/meta.csv.in" >"$_file"
 }
 
+#
+# Subprofile: flow: generate hledger configuration file
+#
+
+function lib_gen::__gen_subprofile_flow_hledger()
+{
+  local -r _gen_path="$1"
+  local -r _gen_conf_path="$2"
+
+  local _dir="${_gen_conf_path}/hledger"
+  [ ! -d "$_dir" ] && mkdir -p "$_dir"
+
+  local _file="${_dir}/hledger.conf"
+  if [ -f "$_file" ]; then
+    lib_utils::print_custom "    \e[32m│  │  │  └─\e[34m hledger configuration found, backup then generate new one? [Y/n] \e[0m"
+    read -p "" _read
+    _confirm="${_read:-y}"
+
+    if [[ "$_confirm" == [yY] ]]; then
+      cp -a "$_file" "${_file}_${global_suffix}" || lib_utils::die_fatal
+
+      lib_gen::__gen_subprofile_hledger_write "$_file"
+      local _print_custom="    \e[32m│  │  │     └─\e[34m Edit (new) hledger configuration now? [Y/n] \e[0m"
+    fi
+  else
+    lib_gen::__gen_subprofile_hledger_write "$_file"
+    local _print_custom="    \e[32m│  │  │  └─\e[34m Edit (new) hledger configuration now? [Y/n] \e[0m"
+  fi
+
+  lib_utils::print_custom "$_print_custom"
+  read -p "" _read
+  _confirm="${_read:-y}"
+  [[ "$_confirm" == [yY] ]] && $EDITOR "$_file"
+}
+
+function lib_gen::__gen_subprofile_flow_hledger_write()
+{
+  local _file="$1"
+  [ -z "$_file" ] && lib_utils::die_fatal
+
+  [ -z "$global_repo_conf_dir" ] && lib_utils::die_fatal
+  lib_utils::print_debug "global_repo_conf_dir=${global_repo_conf_dir}"
+
+  [ -z "$global_client_version" ] && lib_utils::die_fatal
+  lib_utils::print_debug "global_client_version=${global_client_version}"
+
+  sed \
+    -e "s:@DOCKER_FINANCE_VERSION@:${global_client_version}:g" \
+    "${global_repo_conf_dir}/container/hledger/hledger.conf.in" >"$_file"
+}
+
 #
 # Subprofile: flow: generate accounts
 #