[git] gnupg-doc - branch, master, updated. 52ab1ee9c0cf0f600f4685b34bc80bee8af09bec
by Werner Koch
cvs at cvs.gnupg.org
Wed Mar 11 11:01:55 CET 2015
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GnuPG website and other docs".
The branch, master has been updated
via 52ab1ee9c0cf0f600f4685b34bc80bee8af09bec (commit)
from 35bf6904d86030cd5aee790067d8c5ff3d3f2f5d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 52ab1ee9c0cf0f600f4685b34bc80bee8af09bec
Author: Werner Koch <wk at gnupg.org>
Date: Wed Mar 11 10:54:57 2015 +0100
Reworked the list of donors.
diff --git a/tools/mkkudos.sh b/tools/mkkudos.sh
index ce2ad45..fb742a8 100755
--- a/tools/mkkudos.sh
+++ b/tools/mkkudos.sh
@@ -110,20 +110,56 @@ monyear=$(echo "$tmp" | awk -F: 'BEGIN { m[1] = "January";
m[2] = "February"; m[3] = "March"; m[4] = "April"; m[5] = "May";
m[6] = "June"; m[7] = "July"; m[8] = "August"; m[9] = "September";
m[10] = "October"; m[11] = "November"; m[12] = "December"; }
- {printf "%s %d", m[$2] , $1}')
-euromo=$(echo "$tmp" | awk -F: '{printf "%d €", int($8 + 0.5)}')
+ {printf "%s %d", m[int($2)] , $1}')
+thisyear=$(echo "$tmp" | awk -F: '{print $1}')
euroyr=$(echo "$tmp" | awk -F: '{printf "%d €", int($10 + 0.5)}')
-n=$(echo "$tmp" | awk -F: '{printf "%d", $7}')
nyr=$(echo "$tmp" | awk -F: '{printf "%d", $9}')
-euroyr_campaign=$(echo "$tmp" | awk -F: '$1=="2014"{printf "0"; next};{printf "%d", int($10 + 0.5)}')
+
+dontable=$(awk -F: <"$donations" -v thisyear="$thisyear" '
+ BEGIN { m[1] = "January";
+ m[2] = "February"; m[3] = "March"; m[4] = "April"; m[5] = "May";
+ m[6] = "June"; m[7] = "July"; m[8] = "August"; m[9] = "September";
+ m[10] = "October"; m[11] = "November"; m[12] = "December" ;
+ printf "<table border=\"2\" cellspacing=\"0\" cellpadding=\"6\"";
+ printf " rules=\"groups\" frame=\"hsides\">\n";
+ printf "<colgroup>\n";
+ printf "<col class=\"left\" />\n";
+ printf "<col class=\"right\" />\n";
+ printf "<col class=\"right\" />\n";
+ printf "</colgroup>\n";
+ printf "<thead>\n";
+ printf "<tr>\n";
+ printf "<th scope=\"col\" class=\"left\">Month</th>\n";
+ printf "<th scope=\"col\" class=\"right\">#</th>\n";
+ printf "<th scope=\"col\" class=\"right\">€</th>\n";
+ printf "</tr>\n";
+ printf "</thead>\n";
+ printf "<tbody>\n";
+ }
+ NR==1 { nyear = $9; totalyear = int($10 + 0.5);
+ }
+ $1 != thisyear {
+ printf "</tbody>\n";
+ printf "<tbody>\n";
+ printf "<tr><td class=\"left\">%d</td>\n", thisyear;
+ printf " <td class=\"right\">%d</td>\n", nyear;
+ printf " <td class=\"right\">%d</td></tr>\n", totalyear;
+ printf "</tbody>\n";
+ printf "</table>\n";
+ exit 0
+ }
+ { printf "<tr><td class=\"left\">%s</td>\n", m[int($2)];
+ printf " <td class=\"right\">%d</td>\n", $7;
+ printf " <td class=\"right\">%d</td></tr>\n", int($8 + 0.5);
+ }
+')
+
+
# Campaign data
goal="120000"
-tmp=$(grep '^2014:12:' "$donations")
-euro=$(echo "$tmp" | awk -F: '{printf "%d", int($8 + 0.5)}')
-euro=$(($euro + $euroyr_campaign))
-percent=$(echo "$euro:$goal" | awk -F: '{ p = (int($1)*100)/int($2);
+percent=$(echo "$euroyr:$goal" | awk -F: '{ p = (int($1)*100)/int($2);
if(p > 100) { p = 100 };
printf "%d", p}')
@@ -142,10 +178,10 @@ for file in "$htdocs/donate/"kudos-????.html "$htdocs/donate/"kudos.html \
fi
[ $verbose = yes ] && echo "processing $file" >&2
[ -f "$file.tmp" ] && rm "$file.tmp"
- awk -F: -v year=$year -v donors="$donors" \
- -v monyear="$monyear" -v euro="$euro" -v euroyr="$euroyr" \
- -v euromo="$euromo" \
- -v n="$n" -v nyr="$nyr" -v goal="$goal" -v percent="$percent" \
+ awk -F: -v year=$year -v donors="$donors" -v dontable="$dontable" \
+ -v monyear="$monyear" -v thisyear="$thisyear" \
+ -v euro="$euro" -v euroyr="$euroyr" \
+ -v nyr="$nyr" -v goal="$goal" -v percent="$percent" \
-v blogheadline="$blogheadline" \
<"$file" >"$file.tmp" '
/<!--BEGIN-DONATIONS-->/ {indon=1; print; insert("") }
@@ -154,16 +190,14 @@ for file in "$htdocs/donate/"kudos-????.html "$htdocs/donate/"kudos.html \
/<!--END-SOME-DONATIONS-->/ {indon=0}
/<!--BEGIN-DONATIONS_goteo13-->/ {indon=1; print; insert("goteo13") }
/<!--END-DONATIONS_goteo13-->/ {indon=0}
+ /<!--BEGIN-DONATION-TABLE-->/ {indon=1; print; print dontable }
+ /<!--END-DONATION-TABLE-->/ {indon=0}
/<!--INSERT-MONTH-DATE-->/ {
printf "<!--INSERT-MONTH-DATE--> %s\n", monyear;
next
}
- /<!--INSERT-MONTH-EURO-->/ {
- printf "<!--INSERT-MONTH-EURO--> %s\n", euromo;
- next
- }
- /<!--INSERT-MONTH-N-->/ {
- printf "<!--INSERT-MONTH-N--> %s\n", n;
+ /<!--INSERT-THIS-YEAR-->/ {
+ printf "<!--INSERT-THIS-YEAR--> %d\n", thisyear;
next
}
/<!--INSERT-YEAR-EURO-->/ {
diff --git a/web/donate/index.org b/web/donate/index.org
index 5888d95..f77f7cb 100644
--- a/web/donate/index.org
+++ b/web/donate/index.org
@@ -166,10 +166,17 @@
** Recent donors
-#+HTML: <div id="tagcloudlist"><ul>
-#+HTML: <!--BEGIN-SOME-DONATIONS-->
-#+HTML: <!--END-SOME-DONATIONS-->
-#+HTML: <li><a href="/donate/kudos.html">(all)</a></li>
-#+HTML: </ul><p class="doclear"> </p></div>
+#+BEGIN_HTML
+<div id="tagcloudlist"><ul>
+<!--BEGIN-SOME-DONATIONS-->
+<!--END-SOME-DONATIONS-->
+<li><a href="/donate/kudos.html">(all)</a></li>
+</ul><p class="doclear"> </p></div>
+<p>Donations received in
+<!--INSERT-THIS-YEAR-->
+:
+<!--INSERT-YEAR-EURO-->
+</p>
+#+END_HTML
# eof #
diff --git a/web/donate/kudos.org b/web/donate/kudos.org
index f6ad46c..f1ad914 100644
--- a/web/donate/kudos.org
+++ b/web/donate/kudos.org
@@ -2,6 +2,37 @@
#+STARTUP: showall
#+SETUPFILE: "../share/setup.inc"
+* Donation Summary
+
+*** This year
+
+#+BEGIN_HTML
+<!--BEGIN-DONATION-TABLE-->
+<!--END-DONATION-TABLE-->
+#+END_HTML
+
+
+*** Previous years
+
+| Year | # | \EUR | net \EUR |
+| | <r> | <r> | <r> |
+|------+-----+-------+----------|
+| 2014 | 801 | 34700 | |
+| 2013 | 148 | 5041 | 4145 |
+| 2012 | 53 | 5991 | 4963 |
+| 2011 | 21 | 553 | 465 |
+|------+-----+-------+----------|
+| | | 46285 | |
+#+TBLFM: $LR3=vsum(@I.. at II)::$LR4=vsum(@I.. at II)
+#+HTML: <div id="smallnote">
+The "net" column gives the actual value without VAT and credit card
+fees.\\
+#+HTML: </div>
+
+The [[https://gnupg.org/blog/20140512-rewards-sent.html][Goteo crowdfunding]] campaign raised an additional
+32641\thinsp\euro (27429 net) in December 2013.
+
+
* List of Donors
#+HTML: <div id="tagcloudlist"><ul>
@@ -24,45 +55,6 @@
[[https://www.wauland.de][file:logos/whs-logo.png]]
#+HTML: </div>
-** Donation summary
-
-#+BEGIN_HTML
-<p>In
-<!--INSERT-MONTH-DATE--> this month
-we received
-<!--INSERT-MONTH-N--> N
-donations of
-<!--INSERT-MONTH-EURO--> X Euro
-.<br/>
-In this year we received
-<!--INSERT-YEAR-N--> M
-donations of
-<!--INSERT-YEAR-EURO--> Y Euro
-.
-</p>
-#+END_HTML
-
-
-Donations for the previous years:
-
-| Year | # | \EUR | net \EUR |
-| | <r> | <r> | <r> |
-|------+-----+-------+----------|
-| 2011 | 21 | 553 | 465 |
-| 2012 | 53 | 5991 | 4963 |
-| 2013 | 148 | 5041 | 4145 |
-| 2014 | 801 | 34700 | |
-|------+-----+-------+----------|
-| | | 46285 | |
-#+TBLFM: $LR3=vsum(@I.. at II)::$LR4=vsum(@I.. at II)
-
-# In 2014 without the 32641.27 (27429.64) from the Goteo campaign
-
-#+HTML: <div id="smallnote">
-The "net" column gives the actual value without VAT and credit card
-fees.\\
-#+HTML: </div>
-
* Hardware and service donations
We have to thank [[https://www.openit.de][OpenIT]] for their long time support of GnuPG. They
-----------------------------------------------------------------------
Summary of changes:
tools/mkkudos.sh | 70 ++++++++++++++++++++++++++++++++++++++--------------
web/donate/index.org | 17 +++++++++----
web/donate/kudos.org | 70 +++++++++++++++++++++++-----------------------------
3 files changed, 95 insertions(+), 62 deletions(-)
hooks/post-receive
--
The GnuPG website and other docs
http://git.gnupg.org
More information about the Gnupg-commits
mailing list