From 1101fc81b409bf4fa26713193947e731c11e0d62 Mon Sep 17 00:00:00 2001 From: Aaron Fiore Date: Mon, 23 Sep 2024 16:38:42 -0700 Subject: [PATCH 01/10] container: rename `lib_ledger` to `lib_hledger` As said before; `lib_ledger` was meant to be a general abstraction to any underlying CLI ledger. But, between C++ `ledger` and Ledger Hardware Wallet, this abstraction has become too confusing and counterproductive. Since `hledger` will be the underlying implementation for the forseeable future, all doubt should now be removed. --- .../finance/lib/internal/{lib_ledger.bash => lib_hledger.bash} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename container/src/finance/lib/internal/{lib_ledger.bash => lib_hledger.bash} (100%) diff --git a/container/src/finance/lib/internal/lib_ledger.bash b/container/src/finance/lib/internal/lib_hledger.bash similarity index 100% rename from container/src/finance/lib/internal/lib_ledger.bash rename to container/src/finance/lib/internal/lib_hledger.bash From ea392ec3607072105ca84096e988a04ba6e93f77 Mon Sep 17 00:00:00 2001 From: Aaron Fiore Date: Mon, 23 Sep 2024 16:43:39 -0700 Subject: [PATCH 02/10] container: remove `ledger` in place of `hledger` As said before; `lib_ledger` was meant to be a general abstraction to any underlying CLI ledger. But, between C++ `ledger` and Ledger Hardware Wallet, this abstraction has become too confusing and counterproductive. Since `hledger` will be the underlying implementation for the forseeable future, all doubt should now be removed. --- container/plugins/finance/example.bash | 2 +- container/src/finance/completion.bash | 10 ++-- container/src/finance/finance.bash | 16 +++---- .../src/finance/lib/internal/lib_hledger.bash | 46 +++++++++---------- container/src/finance/lib/lib_finance.bash | 20 ++++---- 5 files changed, 47 insertions(+), 47 deletions(-) diff --git a/container/plugins/finance/example.bash b/container/plugins/finance/example.bash index 66f1ac3..eaf08e3 100755 --- a/container/plugins/finance/example.bash +++ b/container/plugins/finance/example.bash @@ -70,7 +70,7 @@ This plugin's arguments: Showing total current BTC balance: - $(lib_finance::ledger bal assets liabilities cur:BTC | tail -n1) + $(lib_finance::hledger bal assets liabilities cur:BTC | tail -n1) " lib_utils::print_custom "$_example" diff --git a/container/src/finance/completion.bash b/container/src/finance/completion.bash index caee9e5..14b7658 100644 --- a/container/src/finance/completion.bash +++ b/container/src/finance/completion.bash @@ -31,7 +31,7 @@ function docker-finance::completion() mapfile -t _profiles < <(pushd "${DOCKER_FINANCE_CONTAINER_FLOW}"/profiles &>/dev/null && ls -d */*) declare -r _profiles - local -r _commands=("all" "edit" "fetch" "hledger" "hledger-ui" "hledger-vui" "hledger-web" "import" "ledger" "ledger-ui" "ledger-vui" "ledger-web" "meta" "plugins" "reports" "root" "taxes" "times") + local -r _commands=("all" "edit" "fetch" "hledger" "hledger-ui" "hledger-vui" "hledger-web" "import" "meta" "plugins" "reports" "root" "taxes" "times") local _reply @@ -66,7 +66,7 @@ function docker-finance::completion() import) mapfile -t _reply < <(compgen -W "help year${global_arg_delim_2}" -- "$_cur") ;; - hledger | ledger) + hledger) # # Commands (as described in v1.40) # @@ -95,13 +95,13 @@ function docker-finance::completion() mapfile -t _reply < <(compgen -W "${_hledger[*]}" -- "$_cur") ;; - hledger-ui | ledger-ui) + hledger-ui) mapfile -t _reply < <(compgen -W "-h" -- "$_cur") ;; - hledger-vui | ledger-vui) + hledger-vui) mapfile -t _reply < <(compgen -W "-h" -- "$_cur") ;; - hledger-web | ledger-web) + hledger-web) mapfile -t _reply < <(compgen -W "-h" -- "$_cur") ;; meta) diff --git a/container/src/finance/finance.bash b/container/src/finance/finance.bash index a2050aa..e36bddf 100755 --- a/container/src/finance/finance.bash +++ b/container/src/finance/finance.bash @@ -113,17 +113,17 @@ function main() import) lib_finance::import "${@:3}" ;; - hledger | ledger) - lib_finance::ledger "${@:3}" + hledger) + lib_finance::hledger "${@:3}" ;; - hledger-ui | ledger-ui) - lib_finance::ledger-ui "${@:3}" + hledger-ui) + lib_finance::hledger-ui "${@:3}" ;; - hledger-vui | ledger-vui) - lib_finance::ledger-vui "${@:3}" + hledger-vui) + lib_finance::hledger-vui "${@:3}" ;; - hledger-web | ledger-web) - lib_finance::ledger-web "${@:3}" + hledger-web) + lib_finance::hledger-web "${@:3}" ;; meta) lib_finance::meta "${@:3}" diff --git a/container/src/finance/lib/internal/lib_hledger.bash b/container/src/finance/lib/internal/lib_hledger.bash index dd9420a..bd6189a 100644 --- a/container/src/finance/lib/internal/lib_hledger.bash +++ b/container/src/finance/lib/internal/lib_hledger.bash @@ -28,38 +28,38 @@ source "${DOCKER_FINANCE_CONTAINER_REPO}/src/finance/lib/internal/lib_utils.bash # Facade # -function lib_ledger::ledger-import() +function lib_hledger::hledger-import() { - lib_ledger::__ledger "$@" - lib_ledger::__ledger-import "$@" + lib_hledger::__hledger "$@" + lib_hledger::__hledger-import "$@" lib_utils::catch $? } -function lib_ledger::ledger-cli() +function lib_hledger::hledger-cli() { - lib_ledger::__ledger "$@" - lib_ledger::__ledger-cli "$@" + lib_hledger::__hledger "$@" + lib_hledger::__hledger-cli "$@" lib_utils::catch $? } -function lib_ledger::ledger-ui() +function lib_hledger::hledger-ui() { - lib_ledger::__ledger "$@" - lib_ledger::__ledger-ui "$@" + lib_hledger::__hledger "$@" + lib_hledger::__hledger-ui "$@" lib_utils::catch $? } -function lib_ledger::ledger-vui() +function lib_hledger::hledger-vui() { - lib_ledger::__ledger "$@" - lib_ledger::__ledger-vui "$@" + lib_hledger::__hledger "$@" + lib_hledger::__hledger-vui "$@" lib_utils::catch $? } -function lib_ledger::ledger-web() +function lib_hledger::hledger-web() { - lib_ledger::__ledger "$@" - lib_ledger::__ledger-web "$@" + lib_hledger::__hledger "$@" + lib_hledger::__hledger-web "$@" lib_utils::catch $? } @@ -68,7 +68,7 @@ function lib_ledger::ledger-web() # # Constructor -function lib_ledger::__ledger() +function lib_hledger::__hledger() { # Base arguments to hledger before end-user added [ -z "$global_child_profile_journal" ] && lib_utils::die_fatal @@ -97,7 +97,7 @@ function lib_ledger::__ledger() lib_utils::print_debug "${global_base_args[*]}" "$@" } -function lib_ledger::__parse_ledger-import() +function lib_hledger::__parse_hledger-import() { [ -z "$global_usage" ] && lib_utils::die_fatal [ -z "$global_arg_delim_1" ] && lib_utils::die_fatal @@ -157,30 +157,30 @@ function lib_ledger::__parse_ledger-import() fi } -function lib_ledger::__ledger-import() +function lib_hledger::__hledger-import() { - lib_ledger::__parse_ledger-import "$@" + lib_hledger::__parse_hledger-import "$@" time hledger-flow import \ "$(dirname $global_child_profile_journal)" \ --start-year "$global_arg_year" } -function lib_ledger::__ledger-cli() +function lib_hledger::__hledger-cli() { [ -z "${global_base_args[*]}" ] && lib_utils::die_fatal hledger "${global_base_args[@]}" "$@" } -function lib_ledger::__ledger-ui() +function lib_hledger::__hledger-ui() { [ -z "${global_base_args[*]}" ] && lib_utils::die_fatal hledger-ui "${global_base_args[@]}" "$@" } -function lib_ledger::__ledger-vui() +function lib_hledger::__hledger-vui() { [ -z "${global_base_args[*]}" ] && lib_utils::die_fatal @@ -188,7 +188,7 @@ function lib_ledger::__ledger-vui() | visidata --motd-url file:///dev/null --filetype csv } -function lib_ledger::__ledger-web() +function lib_hledger::__hledger-web() { [ -z "${global_base_args[*]}" ] && lib_utils::die_fatal diff --git a/container/src/finance/lib/lib_finance.bash b/container/src/finance/lib/lib_finance.bash index cabbc68..d995633 100644 --- a/container/src/finance/lib/lib_finance.bash +++ b/container/src/finance/lib/lib_finance.bash @@ -85,7 +85,7 @@ function lib_finance::finance() # Implementation "libraries" (requires previously set globals) source "${DOCKER_FINANCE_CONTAINER_REPO}/src/finance/lib/internal/lib_edit.bash" || exit 1 source "${DOCKER_FINANCE_CONTAINER_REPO}/src/finance/lib/internal/lib_fetch.bash" || exit 1 - source "${DOCKER_FINANCE_CONTAINER_REPO}/src/finance/lib/internal/lib_ledger.bash" || exit 1 + source "${DOCKER_FINANCE_CONTAINER_REPO}/src/finance/lib/internal/lib_hledger.bash" || exit 1 source "${DOCKER_FINANCE_CONTAINER_REPO}/src/finance/lib/internal/lib_meta.bash" || exit 1 source "${DOCKER_FINANCE_CONTAINER_REPO}/src/finance/lib/internal/lib_plugins.bash" || exit 1 source "${DOCKER_FINANCE_CONTAINER_REPO}/src/finance/lib/internal/lib_reports.bash" || exit 1 @@ -173,31 +173,31 @@ function lib_finance::fetch() function lib_finance::import() { - lib_ledger::ledger-import "$@" + lib_hledger::hledger-import "$@" lib_utils::catch $? } -function lib_finance::ledger() +function lib_finance::hledger() { - lib_ledger::ledger-cli "$@" + lib_hledger::hledger-cli "$@" lib_utils::catch $? } -function lib_finance::ledger-ui() +function lib_finance::hledger-ui() { - lib_ledger::ledger-ui "$@" + lib_hledger::hledger-ui "$@" lib_utils::catch $? } -function lib_finance::ledger-vui() +function lib_finance::hledger-vui() { - lib_ledger::ledger-vui "$@" + lib_hledger::hledger-vui "$@" lib_utils::catch $? } -function lib_finance::ledger-web() +function lib_finance::hledger-web() { - lib_ledger::ledger-web "$@" + lib_hledger::hledger-web "$@" lib_utils::catch $? } From ba293524ef0b6f8f6e09d8c47f200d2a21248035 Mon Sep 17 00:00:00 2001 From: Aaron Fiore Date: Mon, 23 Sep 2024 16:43:59 -0700 Subject: [PATCH 03/10] client: subscript: remove `ledger` in place of `hledger` As said before; `lib_ledger` was meant to be a general abstraction to any underlying CLI ledger. But, between C++ `ledger` and Ledger Hardware Wallet, this abstraction has become too confusing and counterproductive. Since `hledger` will be the underlying implementation for the forseeable future, all doubt should now be removed. --- client/docker-finance.d/container/shell/subscript.bash.in | 4 ---- 1 file changed, 4 deletions(-) diff --git a/client/docker-finance.d/container/shell/subscript.bash.in b/client/docker-finance.d/container/shell/subscript.bash.in index 09abc80..eda7e08 100644 --- a/client/docker-finance.d/container/shell/subscript.bash.in +++ b/client/docker-finance.d/container/shell/subscript.bash.in @@ -30,7 +30,6 @@ # CLI hledger alias @DOCKER_FINANCE_SUBPROFILE@_hledger='$DOCKER_FINANCE_CONTAINER_CMD @DOCKER_FINANCE_PROFILE@/@DOCKER_FINANCE_SUBPROFILE@ hledger' -alias @DOCKER_FINANCE_SUBPROFILE@_ledger='@DOCKER_FINANCE_SUBPROFILE@_hledger' alias @DOCKER_FINANCE_SUBPROFILE@_bal='$DOCKER_FINANCE_CONTAINER_CMD @DOCKER_FINANCE_PROFILE@/@DOCKER_FINANCE_SUBPROFILE@ hledger bal \ assets liabilities \ @@ -43,12 +42,10 @@ alias @DOCKER_FINANCE_SUBPROFILE@_ui='$DOCKER_FINANCE_CONTAINER_CMD @DOCKER_FINA not:desc:balances\$ not:equity:balances\$ not:archive \ ' alias @DOCKER_FINANCE_SUBPROFILE@_hledger-ui='@DOCKER_FINANCE_SUBPROFILE@_ui' -alias @DOCKER_FINANCE_SUBPROFILE@_ledger-ui='@DOCKER_FINANCE_SUBPROFILE@_ui' # Terminal UI (visidata) alias @DOCKER_FINANCE_SUBPROFILE@_vui='$DOCKER_FINANCE_CONTAINER_CMD @DOCKER_FINANCE_PROFILE@/@DOCKER_FINANCE_SUBPROFILE@ hledger-vui' alias @DOCKER_FINANCE_SUBPROFILE@_hledger-vui='@DOCKER_FINANCE_SUBPROFILE@_vui' -alias @DOCKER_FINANCE_SUBPROFILE@_ledger-vui='@DOCKER_FINANCE_SUBPROFILE@_vui' # Web UI alias @DOCKER_FINANCE_SUBPROFILE@_web='$DOCKER_FINANCE_CONTAINER_CMD @DOCKER_FINANCE_PROFILE@/@DOCKER_FINANCE_SUBPROFILE@ hledger-web --serve --host=0.0.0.0 --base-url http://127.0.0.1:5000 --allow=view \ @@ -56,7 +53,6 @@ alias @DOCKER_FINANCE_SUBPROFILE@_web='$DOCKER_FINANCE_CONTAINER_CMD @DOCKER_FIN not:desc:balances\$ not:equity:balances\$ not:archive \ ' alias @DOCKER_FINANCE_SUBPROFILE@_hledger-web='@DOCKER_FINANCE_SUBPROFILE@_web' -alias @DOCKER_FINANCE_SUBPROFILE@_ledger-web='@DOCKER_FINANCE_SUBPROFILE@_web' # Fetches, imports, generates taxes and reports (using defaults) alias @DOCKER_FINANCE_SUBPROFILE@_all='$DOCKER_FINANCE_CONTAINER_CMD @DOCKER_FINANCE_PROFILE@/@DOCKER_FINANCE_SUBPROFILE@ all' From 8a8395e844d72f2c620a5a28b56d790e0eac694e Mon Sep 17 00:00:00 2001 From: Aaron Fiore Date: Mon, 23 Sep 2024 21:01:10 -0700 Subject: [PATCH 04/10] container: src: lib_hledger: pass hledger-{ui,web} args These are currently within the subscript but should be a part of the baseline command. --- container/src/finance/lib/internal/lib_hledger.bash | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/container/src/finance/lib/internal/lib_hledger.bash b/container/src/finance/lib/internal/lib_hledger.bash index bd6189a..39bb6a0 100644 --- a/container/src/finance/lib/internal/lib_hledger.bash +++ b/container/src/finance/lib/internal/lib_hledger.bash @@ -177,7 +177,7 @@ function lib_hledger::__hledger-ui() { [ -z "${global_base_args[*]}" ] && lib_utils::die_fatal - hledger-ui "${global_base_args[@]}" "$@" + hledger-ui "${global_base_args[@]}" -w "$@" } function lib_hledger::__hledger-vui() @@ -192,7 +192,8 @@ function lib_hledger::__hledger-web() { [ -z "${global_base_args[*]}" ] && lib_utils::die_fatal - hledger-web "${global_base_args[@]}" "$@" + hledger-web "${global_base_args[@]}" \ + --serve --host=0.0.0.0 --base-url http://127.0.0.1:5000 --allow=view "$@" } # vim: sw=2 sts=2 si ai et From da8488ebb0bf04daa7167f1abe7ceee557839fec Mon Sep 17 00:00:00 2001 From: Aaron Fiore Date: Mon, 23 Sep 2024 22:16:18 -0700 Subject: [PATCH 05/10] container: src: lib_hledger: fork hledger-web, log print Gives more convenient shell control for end-user. --- .../src/finance/lib/internal/lib_hledger.bash | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/container/src/finance/lib/internal/lib_hledger.bash b/container/src/finance/lib/internal/lib_hledger.bash index 39bb6a0..3cbfbd7 100644 --- a/container/src/finance/lib/internal/lib_hledger.bash +++ b/container/src/finance/lib/internal/lib_hledger.bash @@ -192,8 +192,20 @@ function lib_hledger::__hledger-web() { [ -z "${global_base_args[*]}" ] && lib_utils::die_fatal + local -r _url="http://127.0.0.1:5000" + hledger-web "${global_base_args[@]}" \ - --serve --host=0.0.0.0 --base-url http://127.0.0.1:5000 --allow=view "$@" + --serve --host=0.0.0.0 --base-url "$_url" --allow=view "$@" 1>/dev/null & + + local -r _pid=$! + sleep 3s + + if ! ps -p "$_pid" 1>/dev/null; then + lib_utils::print_error "hledger-web failed. See above error message" + else + lib_utils::print_info "hledger-web started (PID ${_pid}). Point web browser to $_url" + fi + } # vim: sw=2 sts=2 si ai et From a9e1ee39d319addb86395aab4050c01e0d98fe40 Mon Sep 17 00:00:00 2001 From: Aaron Fiore Date: Mon, 23 Sep 2024 22:22:26 -0700 Subject: [PATCH 06/10] client: docker-finance.d: subscript: remove hledger default args These args are now passed within container's `lib_hledger` or docker-finance.d's default generated hledger.conf. --- .../container/shell/subscript.bash.in | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/client/docker-finance.d/container/shell/subscript.bash.in b/client/docker-finance.d/container/shell/subscript.bash.in index eda7e08..38247f9 100644 --- a/client/docker-finance.d/container/shell/subscript.bash.in +++ b/client/docker-finance.d/container/shell/subscript.bash.in @@ -25,22 +25,16 @@ [ -z "$DOCKER_FINANCE_CONTAINER_CMD" ] && echo "DOCKER_FINANCE_CONTAINER_CMD not set, check installation" >&2 -# NOTE: hledger-based commands ending in `\`: the escape is needed so you can add more arguments as needed -# TODO: remove default 'not:' arguments to `hledger{-ui,-web}` once distributions support hledger 1.34.99-gcf0c7c2ef-20240702 or higher (--conf support) - # CLI hledger alias @DOCKER_FINANCE_SUBPROFILE@_hledger='$DOCKER_FINANCE_CONTAINER_CMD @DOCKER_FINANCE_PROFILE@/@DOCKER_FINANCE_SUBPROFILE@ hledger' +# Note: command ends in `\` and newline so you can add more arguments as needed alias @DOCKER_FINANCE_SUBPROFILE@_bal='$DOCKER_FINANCE_CONTAINER_CMD @DOCKER_FINANCE_PROFILE@/@DOCKER_FINANCE_SUBPROFILE@ hledger bal \ assets liabilities \ - not:desc:balances\$ not:equity:balances\$ not:archive \ ' # Terminal UI -alias @DOCKER_FINANCE_SUBPROFILE@_ui='$DOCKER_FINANCE_CONTAINER_CMD @DOCKER_FINANCE_PROFILE@/@DOCKER_FINANCE_SUBPROFILE@ hledger-ui -w \ - assets liabilities \ - not:desc:balances\$ not:equity:balances\$ not:archive \ -' +alias @DOCKER_FINANCE_SUBPROFILE@_ui='$DOCKER_FINANCE_CONTAINER_CMD @DOCKER_FINANCE_PROFILE@/@DOCKER_FINANCE_SUBPROFILE@ hledger-ui' alias @DOCKER_FINANCE_SUBPROFILE@_hledger-ui='@DOCKER_FINANCE_SUBPROFILE@_ui' # Terminal UI (visidata) @@ -48,10 +42,7 @@ alias @DOCKER_FINANCE_SUBPROFILE@_vui='$DOCKER_FINANCE_CONTAINER_CMD @DOCKER_FIN alias @DOCKER_FINANCE_SUBPROFILE@_hledger-vui='@DOCKER_FINANCE_SUBPROFILE@_vui' # Web UI -alias @DOCKER_FINANCE_SUBPROFILE@_web='$DOCKER_FINANCE_CONTAINER_CMD @DOCKER_FINANCE_PROFILE@/@DOCKER_FINANCE_SUBPROFILE@ hledger-web --serve --host=0.0.0.0 --base-url http://127.0.0.1:5000 --allow=view \ - assets liabilities \ - not:desc:balances\$ not:equity:balances\$ not:archive \ -' +alias @DOCKER_FINANCE_SUBPROFILE@_web='$DOCKER_FINANCE_CONTAINER_CMD @DOCKER_FINANCE_PROFILE@/@DOCKER_FINANCE_SUBPROFILE@ hledger-web \' alias @DOCKER_FINANCE_SUBPROFILE@_hledger-web='@DOCKER_FINANCE_SUBPROFILE@_web' # Fetches, imports, generates taxes and reports (using defaults) From 5acbbfb799712f259989acf684ebbdf1b752042d Mon Sep 17 00:00:00 2001 From: Aaron Fiore Date: Mon, 23 Sep 2024 22:33:12 -0700 Subject: [PATCH 07/10] container: src: lib_hledger: remove hledger version test No longer needed because 1.40 is the minimum version provided by the current build (courtesty of repo 'Dockerfiles/remote/hledger-suite'). --- .../src/finance/lib/internal/lib_hledger.bash | 25 +++---------------- 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/container/src/finance/lib/internal/lib_hledger.bash b/container/src/finance/lib/internal/lib_hledger.bash index 3cbfbd7..4b57f76 100644 --- a/container/src/finance/lib/internal/lib_hledger.bash +++ b/container/src/finance/lib/internal/lib_hledger.bash @@ -70,30 +70,11 @@ function lib_hledger::hledger-web() # Constructor function lib_hledger::__hledger() { - # Base arguments to hledger before end-user added + # Base arguments to hledger suite before end-user added + [ -z "$global_conf_hledger" ] && lib_utils::die_fatal [ -z "$global_child_profile_journal" ] && lib_utils::die_fatal - declare -g global_base_args=("-f" "$global_child_profile_journal") - - # - # Apply features to given hledger version. - # - # CLI version formats: - # - # hledger 1.34, linux-x86_64 - # hledger 1.34.99-gcf0c7c2ef-20240702, linux-x86_64 - # - - # TODO: remove now that 1.40 is guaranteed minimum - # 1.34.99 and above - hledger --version \ - | gawk '{ if ($2 !~ /^1.3(4.99|([5-9][\.[0-99]?))/) { exit 1 } }' FS=' ' - - if [ $? -eq 0 ]; then - # --conf is supported - [ -z "$global_conf_hledger" ] && lib_utils::die_fatal - global_base_args+=("--conf" "$global_conf_hledger") - fi + declare -g global_base_args=("--conf" "$global_conf_hledger" "-f" "$global_child_profile_journal") lib_utils::print_debug "${global_base_args[*]}" "$@" } From 7d4a843e6513d616da1da91d04b67dbaf0155a82 Mon Sep 17 00:00:00 2001 From: Aaron Fiore Date: Mon, 23 Sep 2024 23:53:04 -0700 Subject: [PATCH 08/10] client: docker-finance.d: hledger: remove web args These args are a baseline requirement within `lib_hledger` impl. --- client/docker-finance.d/container/hledger/hledger.conf.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/docker-finance.d/container/hledger/hledger.conf.in b/client/docker-finance.d/container/hledger/hledger.conf.in index ef3e290..ead08f7 100644 --- a/client/docker-finance.d/container/hledger/hledger.conf.in +++ b/client/docker-finance.d/container/hledger/hledger.conf.in @@ -24,6 +24,6 @@ [print] not:desc:balances not:equity:balances not:archive [ui] assets liabilities not:desc:balances not:equity:balances not:archive -[web] --serve --host=0.0.0.0 --base-url http://127.0.0.1:5000 --capabilities=view assets liabilities not:desc:balances not:equity:balances not:archive +[web] assets liabilities not:desc:balances not:equity:balances not:archive # vim: syn=bash sw=2 sts=2 si ai et From 4759d10a59299728474ca8730073eeef89f41b82 Mon Sep 17 00:00:00 2001 From: Aaron Fiore Date: Tue, 24 Sep 2024 16:32:02 -0700 Subject: [PATCH 09/10] client: docker-finance.d: hledger: remove comment Remove an outdated comment; hledger 1.40 is now the minimum provided by the docker-finance build system. --- client/docker-finance.d/container/hledger/hledger.conf.in | 1 - 1 file changed, 1 deletion(-) diff --git a/client/docker-finance.d/container/hledger/hledger.conf.in b/client/docker-finance.d/container/hledger/hledger.conf.in index ead08f7..01480c3 100644 --- a/client/docker-finance.d/container/hledger/hledger.conf.in +++ b/client/docker-finance.d/container/hledger/hledger.conf.in @@ -17,7 +17,6 @@ # NOTE: # - File is treated as a plain configuration file (non-executable) -# - Only functional for `hledger 1.34.99-gcf0c7c2ef-20240702` or later # - See sample: https://github.com/simonmichael/hledger/blob/master/hledger.conf.sample [balance] not:desc:balances not:equity:balances not:archive From dae25724675d265c7505050e2840f3c50e5d6bed Mon Sep 17 00:00:00 2001 From: Aaron Fiore Date: Tue, 24 Sep 2024 17:10:55 -0700 Subject: [PATCH 10/10] client: docker-finance.d: hledger: add docker-finance version tag --- client/docker-finance.d/container/hledger/hledger.conf.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/client/docker-finance.d/container/hledger/hledger.conf.in b/client/docker-finance.d/container/hledger/hledger.conf.in index 01480c3..a9ba97d 100644 --- a/client/docker-finance.d/container/hledger/hledger.conf.in +++ b/client/docker-finance.d/container/hledger/hledger.conf.in @@ -15,6 +15,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . +# docker-finance @DOCKER_FINANCE_VERSION@ + # NOTE: # - File is treated as a plain configuration file (non-executable) # - See sample: https://github.com/simonmichael/hledger/blob/master/hledger.conf.sample