summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
Diffstat (limited to 'bin')
-rwxr-xr-xbin/myhledger2
-rwxr-xr-xbin/mymerkur2ledger5
2 files changed, 5 insertions, 2 deletions
diff --git a/bin/myhledger b/bin/myhledger
index cd3a219..d2cdac6 100755
--- a/bin/myhledger
+++ b/bin/myhledger
@@ -20,10 +20,10 @@ journal() {
cat *.ledger 2> /dev/null || true
for year in $years; do
cat $year/*.ledger 2> /dev/null || true
+ cat $year/assets/*.ledger 2> /dev/null || true
cat $year/income/*.ledger 2> /dev/null || true
cat $year/expenses/*.ledger 2> /dev/null || true
done
- cat ../bank/*.ledger 2> /dev/null || true
cat ../taxes/*.ledger 2> /dev/null || true
}
diff --git a/bin/mymerkur2ledger b/bin/mymerkur2ledger
index 429f40f..e047935 100755
--- a/bin/mymerkur2ledger
+++ b/bin/mymerkur2ledger
@@ -1,4 +1,7 @@
#!/bin/sh
+rulesfile="$1"
+shift
+
csvtool -t ";" -u COMMA square "$@" \
- | hledger print --rules-file merkur.rules -f-
+ | hledger print ${rulesfile:+--rules-file "$rulesfile"} -f-