svn commit: r1844647 - /httpd/site/trunk/tools/announce.sh

[dr...@apache.org]

Author: druggeri
Date: Tue Oct 23 13:16:01 2018
New Revision: 1844647

URL: http://svn.apache.org/viewvc?rev=1844647&view=rev
Log:
Add update to STATUS for release data and fix site publishing

Modified:
    httpd/site/trunk/tools/announce.sh

Modified: httpd/site/trunk/tools/announce.sh
URL: http://svn.apache.org/viewvc/httpd/site/trunk/tools/announce.sh?rev=1844647&r1=1844646&r2=1844647&view=diff
==============================================================================
--- httpd/site/trunk/tools/announce.sh (original)
+++ httpd/site/trunk/tools/announce.sh Tue Oct 23 13:16:01 2018
@@ -287,6 +287,15 @@ fi
 #  exit 1
 #fi
 
+#Note this release in STATUS
+date_string=`date '+%B %d, %Y'`
+svn update "$branch_base"/STATUS
+perl -pi -e "s/^(\s+$version\s+:\s+Tagged on \S+ \d+, \d+)/\$1. Released on $date_string./g" "$branch_base"/STATUS
+if ! egrep "$version.*Released on $date_string" "$branch_base"/STATUS >/dev/null;then
+  echo "Failed to set the release date in $branch_base/STATUS"
+  exit 1
+fi
+
 if test -z "$NONINTERACTIVE";then
   echo "All script work is done. You now have the chance to poke around and make sure everything"
   echo "is good before the results are committed and/or emailed to people. This is the last safe place"
@@ -329,9 +338,15 @@ for dir in "$dist_base" "$branch_base" "
 done
 
 #Publish the site updates
-TMP_KEY=`curl -s -u druggeri --url https://cms.apache.org/httpd/publish | grep key | cut -d '"' -f 6`
+TMP_KEY=`curl -s -u "$asf_id" --url https://cms.apache.org/httpd/publish | grep key | cut -d '"' -f 6`
+if test -z "$TMP_KEY";then
+  echo "There was an error getting a key to publish the website."
+  echo "Visit https://cms.apache.org/httpd/publish to do this manually."
+  exit 1
+fi
+
 curl --url https://cms.apache.org/httpd/publish \
   -X POST \
   -u "$asf_id" \
   -H 'Content-Type: application/x-www-form-urlencoded' \
-  -d "key=$key&message=Publish%20$version%20updates&source_url=https%3A%2F%2Fsvn.apache.org%2Frepos%2Fasf%2Fhttpd%2Fsite&submit=Submit&referer="
+  -d "key=$TMP_KEY&message=Publish%20$version%20updates&source_url=https%3A%2F%2Fsvn.apache.org%2Frepos%2Fasf%2Fhttpd%2Fsite&submit=Submit&referer="