>From 8bd125ff4b6e2f34a754bf1adcf4c75a7630cfef Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 11 Apr 2021 14:25:56 +0200 Subject: [PATCH 4/6] gnupload: Implement --version option according to GCS. * build-aux/gnupload (copyright_year, copyright): New variables. (--version): Print also a short copyright and license notice. --- ChangeLog | 4 ++++ build-aux/gnupload | 11 +++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2f9c759..6b6111d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2021-04-11 Bruno Haible + gnupload: Implement --version option according to GCS. + * build-aux/gnupload (copyright_year, copyright): New variables. + (--version): Print also a short copyright and license notice. + git-version-gen: Implement --version option according to GCS. * build-aux/git-version-gen (version): State the license. Use wording from GCS. diff --git a/build-aux/gnupload b/build-aux/gnupload index 90e7c82..e7822ae 100755 --- a/build-aux/gnupload +++ b/build-aux/gnupload @@ -1,7 +1,7 @@ #!/bin/sh # Sign files and upload them. -scriptversion=2018-05-19.18; # UTC +scriptversion=2021-04-11.09; # UTC # Copyright (C) 2004-2021 Free Software Foundation, Inc. # @@ -145,6 +145,12 @@ the build-aux/ directory of the gnulib package Send patches and bug reports to ." +copyright_year=`echo "$scriptversion" | sed -e 's/[^0-9].*//'` +copyright="Copyright (C) ${copyright_year} Free Software Foundation, Inc. +License GPLv2+: GNU GPL version 2 or later . +This is free software: you are free to change and redistribute it. +There is NO WARRANTY, to the extent permitted by law." + # Read local configuration file if test -r "$conffile"; then echo "$0: Reading configuration file $conffile" @@ -209,7 +215,8 @@ while test -n "$1"; do ;; --version) echo "gnupload $scriptversion" - exit $? + echo "$copyright" + exit 0 ;; --) shift -- 2.7.4