Email template tweeks
Project: http://git-wip-us.apache.org/repos/asf/couchdb-admin/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-admin/commit/04160c5f Tree: http://git-wip-us.apache.org/repos/asf/couchdb-admin/tree/04160c5f Diff: http://git-wip-us.apache.org/repos/asf/couchdb-admin/diff/04160c5f Branch: refs/heads/master Commit: 04160c5f248b7110fd7b7945c48489de363cb6dd Parents: d110c33 Author: Noah Slater <[email protected]> Authored: Thu Mar 7 20:16:41 2013 +0000 Committer: Noah Slater <[email protected]> Committed: Thu Mar 7 20:16:41 2013 +0000 ---------------------------------------------------------------------- email/discuss_release.txt | 12 ++++++------ email/reminder_meeting.txt | 4 ++-- email/vote_release.txt | 18 +++++++++--------- release/generate_proposal.sh | 6 +++--- release/publish_candidate.sh | 8 ++++---- 5 files changed, 24 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-admin/blob/04160c5f/email/discuss_release.txt ---------------------------------------------------------------------- diff --git a/email/discuss_release.txt b/email/discuss_release.txt index 29ffd11..b513b75 100644 --- a/email/discuss_release.txt +++ b/email/discuss_release.txt @@ -1,18 +1,18 @@ -Subject: [DISCUSS] Release Apache CouchDB %version% +Subject: [DISCUSS] Release Apache CouchDB %VERSION% Dear community, -I would like to propose that we release Apache CouchDB %version%. +I would like to propose that we release Apache CouchDB %VERSION%. The project aims to produce time-based releases. If your favourite feature is not ready for this version, it can be included in the next version. However, if you know of anything that should block the release, please speak up now. -The %version% NEWS entry as it stands: +The %VERSION% NEWS entry as it stands: -%news% +%NEWS% -The %version% CHANGES entry as it stands: +The %VERSION% CHANGES entry as it stands: - %changes% + %CHANGES% Are these accurate? Please double check any work you may have done and make sure that the corresponding NEWS and CHANGES entries are up-to-date. http://git-wip-us.apache.org/repos/asf/couchdb-admin/blob/04160c5f/email/reminder_meeting.txt ---------------------------------------------------------------------- diff --git a/email/reminder_meeting.txt b/email/reminder_meeting.txt index 9a956c2..d53ebb4 100644 --- a/email/reminder_meeting.txt +++ b/email/reminder_meeting.txt @@ -1,8 +1,8 @@ -Subject: [REMINDER] Weekly IRC meeting, Wednesday (tomorrow) at 20:00 GMT +Subject: [REMINDER] Weekly IRC meeting, %DATE% at 20:00 GMT Dear community, -Please join our weekly IRC meeting, Wednesday (tomorrow) at 20:00 GMT. +Please join our weekly IRC meeting, %DATE% at 20:00 GMT. Everyone is welcome to attend this meeting. http://git-wip-us.apache.org/repos/asf/couchdb-admin/blob/04160c5f/email/vote_release.txt ---------------------------------------------------------------------- diff --git a/email/vote_release.txt b/email/vote_release.txt index 315b237..e5eca60 100644 --- a/email/vote_release.txt +++ b/email/vote_release.txt @@ -1,27 +1,27 @@ -Subject: [VOTE] Release Apache CouchDB %version%-rc.%candidate% +Subject: [VOTE] Release Apache CouchDB %VERSION%-rc.%CANDIDATE% Dear community, -I would like to call a vote on Apache CouchDB %version%-rc.%candidate%. +I would like to call a vote on Apache CouchDB %VERSION%-rc.%CANDIDATE%. Changes since last round: - * [LIST CHANGES] + * %CHANGES% We encourage the whole community to download and test these release artefacts so that any critical issues can be resolved before the release is made. Everyone is free to vote on this release, so get stuck in! The release artefacts we are voting on are available here: - %candidate_url%/%package%.tar.gz - %candidate_url%/%package%.tar.gz.asc - %candidate_url%/%package%.tar.gz.ish - %candidate_url%/%package%.tar.gz.md5 - %candidate_url%/%package%.tar.gz.sha + %CANDIDATE_URL%/%PACKAGE%.tar.gz + %CANDIDATE_URL%/%PACKAGE%.tar.gz.asc + %CANDIDATE_URL%/%PACKAGE%.tar.gz.ish + %CANDIDATE_URL%/%PACKAGE%.tar.gz.md5 + %CANDIDATE_URL%/%PACKAGE%.tar.gz.sha Please follow the test procedure here: http://wiki.apache.org/couchdb/Test_procedure -Please remember that "rc.%candidate%" is an annotation. If the vote passes, these artefacts will be released as Apache CouchDB %version%. +Please remember that "rc.%CANDIDATE%" is an annotation. If the vote passes, these artefacts will be released as Apache CouchDB %VERSION%. Thanks, http://git-wip-us.apache.org/repos/asf/couchdb-admin/blob/04160c5f/release/generate_proposal.sh ---------------------------------------------------------------------- diff --git a/release/generate_proposal.sh b/release/generate_proposal.sh index f1bbd86..27ba791 100755 --- a/release/generate_proposal.sh +++ b/release/generate_proposal.sh @@ -65,7 +65,7 @@ email_in_file = open("$email_in_file") email_in_file_content = email_in_file.read() -email_in_file_content = email_in_file_content.replace("%news%", news) +email_in_file_content = email_in_file_content.replace("%NEWS%", news) email_in_file = open("$email_in_file", "w") @@ -76,8 +76,8 @@ email_file=$tmp_dir/email.txt changes=$GIT_URL"f=CHANGES;hb=$branch" -sed -e "s|%version%|$version|g" \ - -e "s|%changes%|$changes|g" \ +sed -e "s|%VERSION%|$version|g" \ + -e "s|%CHANGES%|$changes|g" \ < $email_in_file > $email_file echo "Email text written to:" $email_file http://git-wip-us.apache.org/repos/asf/couchdb-admin/blob/04160c5f/release/publish_candidate.sh ---------------------------------------------------------------------- diff --git a/release/publish_candidate.sh b/release/publish_candidate.sh index 4a6d3a0..baaf7ee 100755 --- a/release/publish_candidate.sh +++ b/release/publish_candidate.sh @@ -104,10 +104,10 @@ email: \$(EMAIL_FILE) cat \$(EMAIL_FILE) \$(EMAIL_FILE): \$(EMAIL_TPL) - sed -e "s|%version%|\$(VERSION)|g" \ - -e "s|%candidate%|\$(CANDIDATE)|g" \ - -e "s|%candidate_url%|\$(CANDIDATE_URL)|g" \ - -e "s|%package%|\$(PACKAGE)|g" > \ + sed -e "s|%VERSION%|\$(VERSION)|g" \ + -e "s|%CANDIDATE%|\$(CANDIDATE)|g" \ + -e "s|%CANDIDATE_URL%|\$(CANDIDATE_URL)|g" \ + -e "s|%PACKAGE%|\$(PACKAGE)|g" > \ \$@ < \$< EOF
