This is an automated email from the git hooks/post-receive script.
bex pushed a commit to branch master
in repository fedora-budget.
commit 2fda8bea54791972dba451ed9ffa18eccc2a61d0
Author: Brian (bex) Exelbierd <bex(a)pobox.com>
Date: Tue Apr 11 17:05:36 2017 +0200
Reorder columns to put budget first
---
FY18/apac.adoc | 10 +++++-----
FY18/d-i.adoc | 2 +-
FY18/emea.adoc | 10 +++++-----
FY18/events.adoc | 6 +++---
FY18/fads.adoc | 2 +-
FY18/latam.adoc | 10 +++++-----
FY18/mindshare.adoc | 2 +-
FY18/na.adoc | 10 +++++-----
FY18/overall.adoc | 2 +-
_builder/budget2tsv | 5 ++++-
10 files changed, 31 insertions(+), 28 deletions(-)
diff --git a/FY18/apac.adoc b/FY18/apac.adoc
index 4e33c80..ff92be5 100644
--- a/FY18/apac.adoc
+++ b/FY18/apac.adoc
@@ -7,7 +7,7 @@ Budget Report
[caption="", format="csv", separator=" ",
cols="4*>,1", options="header, footer"]
.All amounts are in US Dollars
|===
-Spent So Far Budget Remaining Budget Percent Spent Budget Category
+Budget Spent So Far Remaining Budget Percent Spent Budget Category
include::FY18/apac.csv[]
|===
@@ -18,7 +18,7 @@ Q1 Budget Report
[caption="", format="csv", separator=" ",
cols="4*>,1", options="header, footer"]
.All amounts are in US Dollars
|===
-Spent So Far Budget Remaining Budget Percent Spent Budget Category
+Budget Spent So Far Remaining Budget Percent Spent Budget Category
include::FY18/apac-q1.csv[]
|===
@@ -28,7 +28,7 @@ Q2 Budget Report
[caption="", format="csv", separator=" ",
cols="4*>,1", options="header, footer"]
.All amounts are in US Dollars
|===
-Spent So Far Budget Remaining Budget Percent Spent Budget Category
+Budget Spent So Far Remaining Budget Percent Spent Budget Category
include::FY18/apac-q2.csv[]
|===
@@ -38,7 +38,7 @@ Q3 Budget Report
[caption="", format="csv", separator=" ",
cols="4*>,1", options="header, footer"]
.All amounts are in US Dollars
|===
-Spent So Far Budget Remaining Budget Percent Spent Budget Category
+Budget Spent So Far Remaining Budget Percent Spent Budget Category
include::FY18/apac-q3.csv[]
|===
@@ -48,7 +48,7 @@ Q4 Budget Report
[caption="", format="csv", separator=" ",
cols="4*>,1", options="header, footer"]
.All amounts are in US Dollars
|===
-Spent So Far Budget Remaining Budget Percent Spent Budget Category
+Budget Spent So Far Remaining Budget Percent Spent Budget Category
include::FY18/apac-q4.csv[]
|===
diff --git a/FY18/d-i.adoc b/FY18/d-i.adoc
index e80e1bc..f23ce3e 100644
--- a/FY18/d-i.adoc
+++ b/FY18/d-i.adoc
@@ -7,7 +7,7 @@ Budget Report
[caption="", format="csv", separator=" ",
cols="4*>,1", options="header, footer"]
.All amounts are in US Dollars
|===
-Spent So Far Budget Remaining Budget Percent Spent Budget Category
+Budget Spent So Far Remaining Budget Percent Spent Budget Category
include::FY18/d-i.csv[]
|===
diff --git a/FY18/emea.adoc b/FY18/emea.adoc
index 71c367c..fd948ab 100644
--- a/FY18/emea.adoc
+++ b/FY18/emea.adoc
@@ -7,7 +7,7 @@ Budget Report
[caption="", format="csv", separator=" ",
cols="4*>,1", options="header, footer"]
.All amounts are in US Dollars
|===
-Spent So Far Budget Remaining Budget Percent Spent Budget Category
+Budget Spent So Far Remaining Budget Percent Spent Budget Category
include::FY18/emea.csv[]
|===
@@ -17,7 +17,7 @@ Q1 Budget Report
[caption="", format="csv", separator=" ",
cols="4*>,1", options="header, footer"]
.All amounts are in US Dollars
|===
-Spent So Far Budget Remaining Budget Percent Spent Budget Category
+Budget Spent So Far Remaining Budget Percent Spent Budget Category
include::FY18/emea-q1.csv[]
|===
@@ -27,7 +27,7 @@ Q2 Budget Report
[caption="", format="csv", separator=" ",
cols="4*>,1", options="header, footer"]
.All amounts are in US Dollars
|===
-Spent So Far Budget Remaining Budget Percent Spent Budget Category
+Budget Spent So Far Remaining Budget Percent Spent Budget Category
include::FY18/emea-q2.csv[]
|===
@@ -37,7 +37,7 @@ Q3 Budget Report
[caption="", format="csv", separator=" ",
cols="4*>,1", options="header, footer"]
.All amounts are in US Dollars
|===
-Spent So Far Budget Remaining Budget Percent Spent Budget Category
+Budget Spent So Far Remaining Budget Percent Spent Budget Category
include::FY18/emea-q3.csv[]
|===
@@ -47,7 +47,7 @@ Q4 Budget Report
[caption="", format="csv", separator=" ",
cols="4*>,1", options="header, footer"]
.All amounts are in US Dollars
|===
-Spent So Far Budget Remaining Budget Percent Spent Budget Category
+Budget Spent So Far Remaining Budget Percent Spent Budget Category
include::FY18/emea-q4.csv[]
|===
diff --git a/FY18/events.adoc b/FY18/events.adoc
index 721fec2..bd1ce8f 100644
--- a/FY18/events.adoc
+++ b/FY18/events.adoc
@@ -7,7 +7,7 @@ Flock Budget Report
[caption="", format="csv", separator=" ",
cols="4*>,1", options="header, footer"]
.All amounts are in US Dollars
|===
-Spent So Far Budget Remaining Budget Percent Spent Budget Category
+Budget Spent So Far Remaining Budget Percent Spent Budget Category
include::FY18/flock.csv[]
|===
@@ -17,7 +17,7 @@ FUDCon APAC Budget Report
[caption="", format="csv", separator=" ",
cols="4*>,1", options="header, footer"]
.All amounts are in US Dollars
|===
-Spent So Far Budget Remaining Budget Percent Spent Budget Category
+Budget Spent So Far Remaining Budget Percent Spent Budget Category
include::FY18/fudcon-apac.csv[]
|===
@@ -27,6 +27,6 @@ FUDCon LATAM Budget Report
[caption="", format="csv", separator=" ",
cols="4*>,1", options="header, footer"]
.All amounts are in US Dollars
|===
-Spent So Far Budget Remaining Budget Percent Spent Budget Category
+Budget Spent So Far Remaining Budget Percent Spent Budget Category
include::FY18/fudcon-latam.csv[]
|===
diff --git a/FY18/fads.adoc b/FY18/fads.adoc
index cc10559..3da96f9 100644
--- a/FY18/fads.adoc
+++ b/FY18/fads.adoc
@@ -7,6 +7,6 @@ FADs Budget Report
[caption="", format="csv", separator=" ",
cols="4*>,1", options="header, footer"]
.All amounts are in US Dollars
|===
-Spent So Far Budget Remaining Budget Percent Spent Budget Category
+Budget Spent So Far Remaining Budget Percent Spent Budget Category
include::FY18/fads.csv[]
|===
diff --git a/FY18/latam.adoc b/FY18/latam.adoc
index be83bb2..40358f0 100644
--- a/FY18/latam.adoc
+++ b/FY18/latam.adoc
@@ -7,7 +7,7 @@ Budget Report
[caption="", format="csv", separator=" ",
cols="4*>,1", options="header, footer"]
.All amounts are in US Dollars
|===
-Spent So Far Budget Remaining Budget Percent Spent Budget Category
+Budget Spent So Far Remaining Budget Percent Spent Budget Category
include::FY18/latam.csv[]
|===
@@ -18,7 +18,7 @@ Q1 Budget Report
[caption="", format="csv", separator=" ",
cols="4*>,1", options="header, footer"]
.All amounts are in US Dollars
|===
-Spent So Far Budget Remaining Budget Percent Spent Budget Category
+Budget Spent So Far Remaining Budget Percent Spent Budget Category
include::FY18/latam-q1.csv[]
|===
@@ -28,7 +28,7 @@ Q2 Budget Report
[caption="", format="csv", separator=" ",
cols="4*>,1", options="header, footer"]
.All amounts are in US Dollars
|===
-Spent So Far Budget Remaining Budget Percent Spent Budget Category
+Budget Spent So Far Remaining Budget Percent Spent Budget Category
include::FY18/latam-q2.csv[]
|===
@@ -38,7 +38,7 @@ Q3 Budget Report
[caption="", format="csv", separator=" ",
cols="4*>,1", options="header, footer"]
.All amounts are in US Dollars
|===
-Spent So Far Budget Remaining Budget Percent Spent Budget Category
+Budget Spent So Far Remaining Budget Percent Spent Budget Category
include::FY18/latam-q3.csv[]
|===
@@ -48,7 +48,7 @@ Q4 Budget Report
[caption="", format="csv", separator=" ",
cols="4*>,1", options="header, footer"]
.All amounts are in US Dollars
|===
-Spent So Far Budget Remaining Budget Percent Spent Budget Category
+Budget Spent So Far Remaining Budget Percent Spent Budget Category
include::FY18/latam-q4.csv[]
|===
diff --git a/FY18/mindshare.adoc b/FY18/mindshare.adoc
index e3c947f..a015b36 100644
--- a/FY18/mindshare.adoc
+++ b/FY18/mindshare.adoc
@@ -5,7 +5,7 @@
[caption="", format="csv", separator=" ",
cols="4*>,1", options="header, footer"]
.All amounts are in US Dollars
|===
-Spent So Far Budget Remaining Budget Percent Spent Budget Category
+Budget Spent So Far Remaining Budget Percent Spent Budget Category
include::FY18/mindshare.csv[]
|===
diff --git a/FY18/na.adoc b/FY18/na.adoc
index 5c4668e..9bcb3de 100644
--- a/FY18/na.adoc
+++ b/FY18/na.adoc
@@ -7,7 +7,7 @@ Budget Report
[caption="", format="csv", separator=" ",
cols="4*>,1", options="header, footer"]
.All amounts are in US Dollars
|===
-Spent So Far Budget Remaining Budget Percent Spent Budget Category
+Budget Spent So Far Remaining Budget Percent Spent Budget Category
include::FY18/na.csv[]
|===
@@ -18,7 +18,7 @@ Q1 Budget Report
[caption="", format="csv", separator=" ",
cols="4*>,1", options="header, footer"]
.All amounts are in US Dollars
|===
-Spent So Far Budget Remaining Budget Percent Spent Budget Category
+Budget Spent So Far Remaining Budget Percent Spent Budget Category
include::FY18/na-q1.csv[]
|===
@@ -28,7 +28,7 @@ Q2 Budget Report
[caption="", format="csv", separator=" ",
cols="4*>,1", options="header, footer"]
.All amounts are in US Dollars
|===
-Spent So Far Budget Remaining Budget Percent Spent Budget Category
+Budget Spent So Far Remaining Budget Percent Spent Budget Category
include::FY18/na-q2.csv[]
|===
@@ -38,7 +38,7 @@ Q3 Budget Report
[caption="", format="csv", separator=" ",
cols="4*>,1", options="header, footer"]
.All amounts are in US Dollars
|===
-Spent So Far Budget Remaining Budget Percent Spent Budget Category
+Budget Spent So Far Remaining Budget Percent Spent Budget Category
include::FY18/na-q3.csv[]
|===
@@ -48,7 +48,7 @@ Q4 Budget Report
[caption="", format="csv", separator=" ",
cols="4*>,1", options="header, footer"]
.All amounts are in US Dollars
|===
-Spent So Far Budget Remaining Budget Percent Spent Budget Category
+Budget Spent So Far Remaining Budget Percent Spent Budget Category
include::FY18/na-q4.csv[]
|===
diff --git a/FY18/overall.adoc b/FY18/overall.adoc
index baf1fde..44dbcfc 100644
--- a/FY18/overall.adoc
+++ b/FY18/overall.adoc
@@ -7,7 +7,7 @@ Budget Report
[caption="", format="csv", separator=" ",
cols="4*>,1", options="header, footer"]
.All amounts are in US Dollars
|===
-Spent So Far Budget Remaining Budget Percent Spent Budget Category
+Budget Spent So Far Remaining Budget Percent Spent Budget Category
include::FY18/overall.csv[]
|===
diff --git a/_builder/budget2tsv b/_builder/budget2tsv
index 03ce5d4..ae96601 100755
--- a/_builder/budget2tsv
+++ b/_builder/budget2tsv
@@ -1,5 +1,7 @@
#!/bin/bash
+# Goal Column Order: Budget | Spent So Far | Remaining Budget | Percent Spent | Budget
Category
+
# Ignore lines that start with dashes
# Remove leading spaces
# Replace multiple spaces with a single tab
@@ -9,4 +11,5 @@
# 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 :
-grep -v '^----' | sed 's/^ \+//' | sed 's/ \+ /\t/g' | sed
's/ \$/\t\$/g' | sed 's/^\$-/\$/' | sed 's/%$/%\tTotal/' | sed
's/^\([$]*[0-9.,]\+\t\)\$-/\1\$/' | sed 's/\$-/-\$/g' | sed
's/\t[^\t]\+:\([^:]\+\)$/\t\1/'
+# 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/^\$-/\$/' | 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}'
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.