From: Christian Franke <Christian.Franke@t-online.de>
To: cygwin-apps@cygwin.com
Subject: Re: [PATCH cygport] Use correct wording if only one package is announced
Date: Fri, 23 Feb 2024 12:16:48 +0100 [thread overview]
Message-ID: <fadecf95-47c1-6ac6-c785-2b920e034421@t-online.de> (raw)
In-Reply-To: <021d66c4-f2ed-4e40-a39e-15cc91026c4f@SystematicSW.ab.ca>
[-- Attachment #1: Type: text/plain, Size: 425 bytes --]
Brian Inglis via Cygwin-apps wrote:
> On 2024-02-21 07:25, Christian Franke via Cygwin-apps wrote:
>
> Change variable name from $s to $has or $s_have as variable $s usually
> implies only the plural letter s or nothing; e.g.
> ...
> + local has="s have"
> +
> + [ $pkg_count != 1 ] || has=" has"
> ...
> +The following package${has} been uploaded to the Cygwin distribution:
> ...
Agree - new patch attached.
[-- Attachment #2: 0001-Use-correct-wording-if-only-one-package-is-announced.patch --]
[-- Type: text/plain, Size: 1129 bytes --]
From 6da0f806a94621d0ecfcca3c63e5c46e8ab3cd32 Mon Sep 17 00:00:00 2001
From: Christian Franke <christian.franke@t-online.de>
Date: Fri, 23 Feb 2024 11:35:01 +0100
Subject: [PATCH] Use correct wording if only one package is announced
---
lib/pkg_upload.cygpart | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/lib/pkg_upload.cygpart b/lib/pkg_upload.cygpart
index dcae8e2c..37bc2d63 100644
--- a/lib/pkg_upload.cygpart
+++ b/lib/pkg_upload.cygpart
@@ -172,6 +172,9 @@ __pkg_announce() {
local msg=$(mktemp -t cygwin-announce-${PF}.XXXXXX)
local msgat=$(date +@%s)
local -i n=0
+ local s_have="s have"
+
+ [ $pkg_count != 1 ] || s_have=" has"
cat > ${msg} <<_EOF
From cygwin-announce-${PF} $(date '+%a %b %d %H:%M:%S %Y' --date=${msgat})
@@ -181,7 +184,7 @@ Date: $(date -R --date=${msgat})
Message-Id: <$(date "+%Y%m%d%H%M%S.$$" --date=${msgat})-1-$(echo ${SMTP_SENDER} | sed 's|.*<\(.*\)>.*|\1|')>
Subject: ${NAME} ${PVR}
-The following packages have been uploaded to the Cygwin distribution:
+The following package${s_have} been uploaded to the Cygwin distribution:
_EOF
--
2.43.0
next prev parent reply other threads:[~2024-02-23 11:17 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-21 14:25 Christian Franke
2024-02-21 21:36 ` Brian Inglis
2024-02-23 11:16 ` Christian Franke [this message]
2024-03-10 17:20 ` Jon Turney
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=fadecf95-47c1-6ac6-c785-2b920e034421@t-online.de \
--to=christian.franke@t-online.de \
--cc=cygwin-apps@cygwin.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).