[git] gnupg-doc - branch, preview, updated. 311af917223f088e1549d12757f0acee5270f715

[by Werner Koch]

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, preview has been updated
       via  311af917223f088e1549d12757f0acee5270f715 (commit)
      from  f63ee27646a5643b14fac602bf91ba9746cdfc19 (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 311af917223f088e1549d12757f0acee5270f715
Author: Werner Koch <wk at gnupg.org>
Date:   Wed May 24 12:04:13 2017 +0200

    tools: Indicate a recurring donation in the thank you mail.
    
    We should eventually provide more information.  But that is better
    done by a separate tool and not with that crude script.

diff --git a/tools/append-to-donors.sh b/tools/append-to-donors.sh
index fd8faf6..c675e04 100755
--- a/tools/append-to-donors.sh
+++ b/tools/append-to-donors.sh
@@ -126,6 +126,11 @@ trap "rm -f $LOCKFILE $donors.tmp $donors.stamp" 0
 #        pubkey field to the donation page?
 #
 send_thanks () {
+    if [ $1 -gt 0 ]; then
+        recurring="recurring "
+    else
+        recurring=""
+    fi
     upcurrency=$(echo $currency | tr [a-z] [A-Z])
     if [ "$upcurrency" = EUR ]; then
         ineuro=
@@ -159,7 +164,7 @@ X-Loop: gnupg-donations-thanks.gnupg.org
 
 Dear ${name:-Anonymous},
 
-we received $xamount $upcurrency$ineuro as a donation to the GnuPG project.
+we received $xamount $upcurrency$ineuro as a ${recurring}donation to the GnuPG project.
 Your donation helps us to develop and maintain GnuPG and related software.
 
 Thank you.
@@ -230,7 +235,7 @@ find $journal_dir/ -type f -name 'journal-????????.log' -print \
             # Note that we removed colons from $name
             echo "$jyear:$datestr:$name::$lnr:" >> "$donors.tmp"
             touch "$donors".stamp
-            send_thanks
+            send_thanks 0
          done
         # Second for new subscriptions
         payproc-jrnl -F_lnr -Fdate -F'[name]' -F'[message]' \
@@ -245,7 +250,7 @@ find $journal_dir/ -type f -name 'journal-????????.log' -print \
             # Note that we removed colons from $name
             echo "$jyear:$datestr:$name:S:$lnr:" >> "$donors.tmp"
             touch "$donors".stamp
-            send_thanks
+            send_thanks 1
          done
     fi
 done

-----------------------------------------------------------------------

Summary of changes:
 tools/append-to-donors.sh | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
The GnuPG website and other docs
http://git.gnupg.org