From 918c4dbb2dedfeb98e78d53c5ee51aad0207f257 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Thu, 3 Jul 2014 17:47:35 +0200 Subject: Restructure bank/{account}-{year}.* → {year}/assets/{account}.*. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/myhledger | 2 +- bin/mymerkur2ledger | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'bin') 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- -- cgit v1.2.3