From 3c6c9311daa9a10ab889663149002bb79e2446e4 Mon Sep 17 00:00:00 2001 From: Aaron Fiore Date: Mon, 24 Jun 2024 15:13:43 -0700 Subject: [PATCH] client/container: bash: add hledger aliases The original intent of the `ledger` facade was to describe a general purpose "ledger" command abstraction; not specifically the `ledger` software (predecessor to hledger) nor the `ledger` hardware device. As `hledger` is currently the exclusive internal "ledger" component, adding `hledger` as an alias seems to be an appropriate-enough addition that won't break existing abstraction/functionality. --- .../container/shell/subprofile.bash.in | 7 ++++++- container/src/finance/finance.bash | 12 ++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/client/docker-finance.d/container/shell/subprofile.bash.in b/client/docker-finance.d/container/shell/subprofile.bash.in index 9a0423e..025c751 100644 --- a/client/docker-finance.d/container/shell/subprofile.bash.in +++ b/client/docker-finance.d/container/shell/subprofile.bash.in @@ -29,23 +29,28 @@ # CLI ledger alias @DOCKER_FINANCE_SUBPROFILE@_ledger='$DOCKER_FINANCE_CONTAINER_CMD @DOCKER_FINANCE_PROFILE@/@DOCKER_FINANCE_SUBPROFILE@ ledger' +alias @DOCKER_FINANCE_SUBPROFILE@_hledger='@DOCKER_FINANCE_SUBPROFILE@_ledger' alias @DOCKER_FINANCE_SUBPROFILE@_bal='$DOCKER_FINANCE_CONTAINER_CMD @DOCKER_FINANCE_PROFILE@/@DOCKER_FINANCE_SUBPROFILE@ ledger bal \ assets liabilities \ not:desc:balances\$ not:equity:balances\$ not:archive \ ' -# CLI UI +# Terminal UI alias @DOCKER_FINANCE_SUBPROFILE@_ui='$DOCKER_FINANCE_CONTAINER_CMD @DOCKER_FINANCE_PROFILE@/@DOCKER_FINANCE_SUBPROFILE@ ledger-ui -w \ assets liabilities \ not:desc:balances\$ not:equity:balances\$ not:archive \ ' +alias @DOCKER_FINANCE_SUBPROFILE@_ledger-ui='@DOCKER_FINANCE_SUBPROFILE@_ui' +alias @DOCKER_FINANCE_SUBPROFILE@_hledger-ui='@DOCKER_FINANCE_SUBPROFILE@_ui' # Web UI alias @DOCKER_FINANCE_SUBPROFILE@_web='$DOCKER_FINANCE_CONTAINER_CMD @DOCKER_FINANCE_PROFILE@/@DOCKER_FINANCE_SUBPROFILE@ ledger-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 \ ' +alias @DOCKER_FINANCE_SUBPROFILE@_ledger-web='@DOCKER_FINANCE_SUBPROFILE@_web' +alias @DOCKER_FINANCE_SUBPROFILE@_hledger-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' diff --git a/container/src/finance/finance.bash b/container/src/finance/finance.bash index 26c153b..914d48a 100755 --- a/container/src/finance/finance.bash +++ b/container/src/finance/finance.bash @@ -54,9 +54,9 @@ function main() edit \e[34;3mEdit existing container data\e[0m fetch \e[34;3mFetch remote accounts\e[0m import \e[34;3mImport CSVs for given year (default: current year)\e[0m - ledger \e[34;3mRun CLI ledger-based commands\e[0m - ledger-ui \e[34;3mStart ncurses-based UI\e[0m - ledger-web \e[34;3mStart web-based UI\e[0m + ledger \e[34;3mRun CLI accounting commands (hledger)\e[0m + ledger-ui \e[34;3mStart terminal UI (hledger-ui)\e[0m + ledger-web \e[34;3mStart web-based UI (hledger-web)\e[0m meta \e[34;3mSearch local financial metadata\e[0m reports \e[34;3mGenerate balance sheet, income statement, etc.\e[0m root \e[34;3mRun ROOT.cern instance for docker-finance analysis\e[0m @@ -107,13 +107,13 @@ function main() import) lib_finance::import "${@:3}" ;; - ledger) + ledger | hledger) lib_finance::ledger "${@:3}" ;; - ledger-ui) + ledger-ui | hledger-ui) lib_finance::ledger-ui "${@:3}" ;; - ledger-web) + ledger-web | hledger-web) lib_finance::ledger-web "${@:3}" ;; meta)