svn commit: r1893912 - /httpd/dev-tools/release/r6-announce.sh

[ic...@apache.org]

Author: icing
Date: Tue Oct  5 13:22:00 2021
New Revision: 1893912

URL: http://svn.apache.org/viewvc?rev=1893912&view=rev
Log:
 * release r6, generating the correct curl command lines to send the announce mails (hopefully).


Modified:
    httpd/dev-tools/release/r6-announce.sh

Modified: httpd/dev-tools/release/r6-announce.sh
URL: http://svn.apache.org/viewvc/httpd/dev-tools/release/r6-announce.sh?rev=1893912&r1=1893911&r2=1893912&view=diff
==============================================================================
--- httpd/dev-tools/release/r6-announce.sh (original)
+++ httpd/dev-tools/release/r6-announce.sh Tue Oct  5 13:22:00 2021
@@ -71,6 +71,9 @@ fi
 DATE=`date '+%a, %d %b %Y %H:%M:%S %z'`
 email="${asf_id}@apache.org"
 
+echo "Announcement Emails are being prepared in ${DIST_DIR}/mail_announce_*."
+echo "You may use the following commands to send these:"
+echo ""
 counter=0
 for rcpt in ${ANNOUNCE_LISTS}; do
     MID="<`perl -e 'print time . ".";@chars=("A".."Z",0..0);print $chars[rand @chars] for 1..8;'`@httpd.apache.org>"
@@ -85,20 +88,15 @@ Message-ID: $MID
 
 EOF
   cat "${AO_DIST_RELEASE_PATH}/${ANNOUNCEMENT}" >> "${mail_file}"
-  counter=`expr $counter + 1`
-done
-
-echo "Announcement Emails have been prepared in ${DIST_DIR}/mail_announce_*."
-echo "You may use the following commands to send these:"
-echo ""
-for mail_announce in "${DIST_DIR}/mail_announce_${VERSION}-"*.txt; do
-cat <<EOF
+  cat <<EOF
   curl --url 'smtps://mail-relay.apache.org:465' \\
     --ssl-reqd --mail-from "${email}" \\
     --mail-rcpt "${rcpt}"  --user '${asf_id}' \\
-    --upload-file '${mail_announce}'
+    --upload-file '${mail_file}'
 
 EOF
+
+  counter=`expr $counter + 1`
 done