This is an automated email from the git hooks/post-receive script.
bex pushed a change to branch master
in repository fedora-budget.
from 78bf2f3 Ugh - again
new 62f043c Fix display of budget components w/no 2nd level
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
FY18/gen_reports | 21 ++++++---------------
1 file changed, 6 insertions(+), 15 deletions(-)
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
Show replies by date
This is an automated email from the git hooks/post-receive script.
bex pushed a commit to branch master
in repository fedora-budget.
commit 62f043c9f3c9ca35a67fb9a941a77ee1910d31ac
Author: Brian (bex) Exelbierd <bex(a)pobox.com>
Date: Thu Jun 29 16:02:48 2017 +0200
Fix display of budget components w/no 2nd level
---
FY18/gen_reports | 21 ++++++---------------
1 file changed, 6 insertions(+), 15 deletions(-)
diff --git a/FY18/gen_reports b/FY18/gen_reports
index 181a6fb..f52d1ad 100755
--- a/FY18/gen_reports
+++ b/FY18/gen_reports
@@ -9,11 +9,8 @@ if [ ! -s overall.csv ]; then
ledger -f ledger/fedora.ledger budget --depth 1 | ../_builder/budget2tsv >
overall.csv
fi
-# Flock
-ledger -f ledger/fedora.ledger budget '^Flock' and not '^Flock$' --flat |
../_builder/budget2tsv > flock.csv
-if [ ! -s flock.csv ]; then
- ledger -f ledger/fedora.ledger budget '^Flock' --flat |
../_builder/budget2tsv > flock.csv
-fi
+# Flock - doesn't do second levels so we need to just do the first level list and cut
the first line
+ledger -f ledger/fedora.ledger budget '^Flock' --flat | tail -n +2 |
../_builder/budget2tsv > flock.csv
# FADs
ledger -f ledger/fedora.ledger budget '^FADs' and not '^FADs$' --depth 2
--flat | ../_builder/budget2tsv > fads.csv
@@ -21,17 +18,11 @@ if [ ! -s fads.csv ]; then
ledger -f ledger/fedora.ledger budget '^FADs' --flat | ../_builder/budget2tsv
> fads.csv
fi
-# Diversity & Inclusion
-ledger -f ledger/fedora.ledger budget '^D&I' and not '^D&I$'
--flat | ../_builder/budget2tsv > d-i.csv
-if [ ! -s d-i.csv ]; then
- ledger -f ledger/fedora.ledger budget '^D&I' --flat |
../_builder/budget2tsv > d-i.csv
-fi
+# Diversity & Inclusion - doesn't do second levels so we need to just do the
first level list and cut the first line
+ledger -f ledger/fedora.ledger budget '^D&I' --flat | tail -n +2 |
../_builder/budget2tsv > mindshare.csv
-# Mindshare
-ledger -f ledger/fedora.ledger budget '^Mindshare' and not '^Mindshare$'
--flat | ../_builder/budget2tsv > mindshare.csv
-if [ ! -s mindshare.csv ]; then
- ledger -f ledger/fedora.ledger budget '^Mindshare' --flat |
../_builder/budget2tsv > mindshare.csv
-fi
+# Mindshare - doesn't do second levels so we need to just do the first level list and
cut the first line
+ledger -f ledger/fedora.ledger budget '^Mindshare' --flat | tail -n +2 |
../_builder/budget2tsv > mindshare.csv
# APAC
ledger -f ledger/fedora.ledger budget '^APAC' and not '^APAC$' --flat
--depth 2 | ../_builder/budget2tsv > apac.csv
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.