Bruno Haible <[email protected]> writes: > Hi Collin, > >> How about the attached patch instead, which adds a >> 'gnu_web_doc_update_args' Makefile variable and passes it to the script? >> I prefer that to an environment variable. >> >> Then, for example, in GNU Hello's cfg.mk I could add: >> >> gnu_web_doc_update_args = --user collinfunk >> >> And have things work as expected. > > But you are not / won't always be the only maintainer of GNU Hello.
Well I was thinking that it was just a one line change, so it isn't a huge deal. > To me, an environment variable is the better choice. Every user can set it > in their own ~/.bash_profile: > > SAVANNAH_CVS_USER=collinfunk > > That would be > - per-user, not per-project, > - unambiguous regarding the purpose. Yeah, my solution assumed that only one person uploaded releases for a project, which may not be true. Your solution works much better in that case. I pushed the attached patch adding the SAVANNAH_CVS_USER variable. I left a fallback to USER since probably a few people rely on that longstanding behavior. Collin
>From 3991b1f62c44792f4869df88c695bd93b6eb732e Mon Sep 17 00:00:00 2001 Message-ID: <3991b1f62c44792f4869df88c695bd93b6eb732e.1774580788.git.collin.fu...@gmail.com> From: Collin Funk <[email protected]> Date: Thu, 26 Mar 2026 19:59:19 -0700 Subject: [PATCH] gnu-web-doc-update: Add an environment variable for the CVS username * build-aux/gnu-web-doc-update (help): Mention the SAVANNAH_CVS_USER environment variable. ($cvs_user): Use the SAVANNAH_CVS_USER environment variable and fallback to USER if it is unset or empty. --- ChangeLog | 8 ++++++++ build-aux/gnu-web-doc-update | 8 +++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index fb757efcd0..01175b8c6f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2026-03-26 Collin Funk <[email protected]> + + gnu-web-doc-update: Add an environment variable for the CVS username + * build-aux/gnu-web-doc-update (help): Mention the SAVANNAH_CVS_USER + environment variable. + ($cvs_user): Use the SAVANNAH_CVS_USER environment variable and fallback + to USER if it is unset or empty. + 2026-03-24 Collin Funk <[email protected]> doc: Mention a Solaris 11.4 bug. diff --git a/build-aux/gnu-web-doc-update b/build-aux/gnu-web-doc-update index 15e7f6490f..e4427a8b71 100755 --- a/build-aux/gnu-web-doc-update +++ b/build-aux/gnu-web-doc-update @@ -2,7 +2,7 @@ # Run this after each non-alpha release, to update the web documentation at # https://www.gnu.org/software/$pkg/manual/ -VERSION=2025-06-10.02; # UTC +VERSION=2026-03-27.02; # UTC # Copyright (C) 2009-2026 Free Software Foundation, Inc. @@ -41,7 +41,9 @@ Options: -C, --builddir=DIR location of (configured) Makefile (default: .) -n, --dry-run don't actually commit anything -m, --mirror remove out of date files from document server - -u, --user the name of the CVS user on Savannah + -u, --user=USER use USER as the name of the CVS user on Savannah + instead of the value of the SAVANNAH_CVS_USER + environment variable --help print this help, then exit --version print version number, then exit @@ -110,7 +112,7 @@ find_tool XARGS gxargs xargs builddir=. dryrun= rm_stale='echo' -cvs_user="$USER" +cvs_user="${SAVANNAH_CVS_USER:-$USER}" while test $# != 0 do # Handle --option=value by splitting apart and putting back on argv. -- 2.53.0
