update the comments wrt hooks

[code/fbi-announce.git] / fbi-announce.sh

diff --git a/fbi-announce.sh b/fbi-announce.sh
index b7f06921c6332b09970c76f0db2778ccb8a59b64..eb0329c644572aa3062f877f5588265c3c9198cd 100755 (executable)
--- a/fbi-announce.sh
+++ b/fbi-announce.sh
@@ -23,19 +23,7 @@
 #                               [@@component@@/]@@project@@: @@author@@: \
 #                               @@logmessage@@ [@@ref@@] @@url@@)
 #
 #                               [@@component@@/]@@project@@: @@author@@: \
 #                               @@logmessage@@ [@@ref@@] @@url@@)
 #

-# The hook is meant ot be run either from a post-commit hook or an update hook. If run in
-# a central repository where people push to you want to run it in the update hook!
-#
-#   post-commit: It parses latest commit and current HEAD to get the information it needs.
-#
-#   update: You have to call it once per merged commit:
-#
-#       refname=$1
-#       oldhead=$2
-#       newhead=$3
-#       for merged in $(git rev-list ${oldhead}..${newhead} | tac) ; do
-#               /path/to/ciabot.bash ${refname} ${merged}
-#       done
+# The hook is meant ot be run from the Git post-receive hook.

 #
 set -eu
 
 #
 set -eu
 


@@ -58,7 +46,7 @@ from=$(git config hooks.fbi-emailsender 2>/dev/null ||:)
 to="commit@commit.ganneff.de" #TODO: possibly factor out to config
 
 # mail submission client to use
 to="commit@commit.ganneff.de" #TODO: possibly factor out to config
 
 # mail submission client to use

-if [ -n "$FBI_ANNOUNCE_TO_STDOUT" ]; then
+if [ -n "${FBI_ANNOUNCE_TO_STDOUT:-}" ]; then

   sendmail="cat"
   echo >&2 'I: outputting to stdout since $FBI_ANNOUNCE_TO_STDOUT is set.'
 else
   sendmail="cat"
   echo >&2 'I: outputting to stdout since $FBI_ANNOUNCE_TO_STDOUT is set.'
 else


@@ -99,7 +87,7 @@ ${sendmail} <<_eom
 ${from:+From: ${from}
 }To: ${to}
 Subject: Announce ${project}
 ${from:+From: ${from}
 }To: ${to}
 Subject: Announce ${project}

-Message-Id: <fbi-announce.${ref}@${project}>
+Message-Id: <fbi-announce.${project}.${ref}@$(hostname --fqdn)>

 
 ${msg}
 _eom
 
 ${msg}
 _eom