This is an automated email from the git hooks/post-receive script.
bex pushed a commit to branch master
in repository fedora-budget.
commit cd238e4e8b35d50e4f65d7259cd36a672a02a3d1
Author: Brian (bex) Exelbierd <bex(a)pobox.com>
Date: Thu Aug 3 12:08:15 2017 +0200
Updates to FY18 generation scripts
---
FY18/gen_reports | 2 +-
_builder/budget2tsv | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/FY18/gen_reports b/FY18/gen_reports
index b10be11..0e96881 100755
--- a/FY18/gen_reports
+++ b/FY18/gen_reports
@@ -4,7 +4,7 @@
rm *.csv
# Overall Report for Fedora
-ledger -f ledger/fedora.ledger budget --depth 1 not '^Annual Budget$' |
../_builder/budget2tsv > overall.csv
+ledger -f ledger/fedora.ledger budget --depth 1 not '^Annual Budget$' and not
'^External$' | ../_builder/budget2tsv > overall.csv
if [ ! -s overall.csv ]; then
ledger -f ledger/fedora.ledger budget --depth 1 | ../_builder/budget2tsv >
overall.csv
fi
diff --git a/_builder/budget2tsv b/_builder/budget2tsv
index 3a7612f..2113f7b 100755
--- a/_builder/budget2tsv
+++ b/_builder/budget2tsv
@@ -12,6 +12,7 @@
# Add the word "Total" to the last line, detected as a line ending in a
percentage sign
# Remove the negative sign from values in the second column, this is because expenses are
budgeted as negative but display better as positive
# Set up any remaining negative values to be -$ not $-
-# Remove any Account Nesting present by removing all values before the last :
+# Remove any Account Nesting present by removing the first colon separated value
+# Convert remaining colons to dashes
# Swap the first and second columns to get to the goal order
-grep -v '^----' | sed 's/^ \+//' | sed 's/ \+ /\t/g' | sed
's/ \$/\t\$/g' | sed 's/^\$\([0-9]\)/-\$\1/' | sed 's/^\$-/\$/' |
sed 's/0$/0%/' | sed 's/0 \([a-zA-F]\)/0% \1/' | sed
's/%$/%\tTotal/' | sed 's/^\([-$]*[0-9.,]\+\t\)\$-/\1\$/' | sed
's/\$-/-\$/g' | sed 's/\t[^\t]\+:\([^:]\+\)$/\t\1/' | awk 'BEGIN{
FS="\t" } {print $2 "\t" $1 "\t" $3 "\t" $4
"\t" $5}'
+grep -v '^----' | sed 's/^ \+//' | sed 's/ \+ /\t/g' | sed
's/ \$/\t\$/g' | sed 's/^\$\([0-9]\)/-\$\1/' | sed 's/^\$-/\$/' |
sed 's/0$/0%/' | sed 's/0 \([a-zA-F]\)/0% \1/' | sed
's/%$/%\tTotal/' | sed 's/^\([-$]*[0-9.,]\+\t\)\$-/\1\$/' | sed
's/\$-/-\$/g' | sed 's/\t[^:\t]\+:/\t/' | sed 's/:/-/g' | awk
'BEGIN{ FS="\t" } {print $2 "\t" $1 "\t" $3
"\t" $4 "\t" $5}'
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.