[pacman-dev] [PATCH] scripts: deduplicate localized copyright messages

[Eli Schwartz]

Fixes FS#58452
Also consistently add a blank line after the copyright and before the
license terms.

Signed-off-by: Eli Schwartz <eschwartz at archlinux.org>
---

Do the email address lines need to be translated? Anyway, currently
updating the pacman copyright year dirties the translations. It could be
interpolated but then the copyright year updating code needs to be as
well.

 scripts/makepkg.sh.in           | 5 +++--
 scripts/pacman-db-upgrade.sh.in | 3 ++-
 scripts/pacman-key.sh.in        | 3 ++-
 scripts/pkgdelta.sh.in          | 3 ++-
 scripts/repo-add.sh.in          | 3 ++-
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 299f9f7f..b4d8fed4 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -1192,9 +1192,10 @@ usage() {

 version() {
 	printf "makepkg (pacman) %s\n" "$makepkg_version"
+	printf -- "$(gettext "Copyright (c) 2006-2018 Pacman Development Team <pacman-dev at archlinux.org>.\n")"
+	printf -- "$(gettext "Copyright (C) 2002-2006 Judd Vinet <jvinet at zeroflux.org>.\n")"
+	printf '\n'
 	printf -- "$(gettext "\
-Copyright (c) 2006-2018 Pacman Development Team <pacman-dev at archlinux.org>.\n\
-Copyright (C) 2002-2006 Judd Vinet <jvinet at zeroflux.org>.\n\n\
 This is free software; see the source for copying conditions.\n\
 There is NO WARRANTY, to the extent permitted by law.\n")"
 }
diff --git a/scripts/pacman-db-upgrade.sh.in b/scripts/pacman-db-upgrade.sh.in
index 9f27a2a2..55a3e8f7 100644
--- a/scripts/pacman-db-upgrade.sh.in
+++ b/scripts/pacman-db-upgrade.sh.in
@@ -54,8 +54,9 @@ usage() {

 version() {
 	printf "pacman-db-upgrade (pacman) %s\n" "$myver"
+	printf -- "$(gettext "Copyright (c) 2010-2018 Pacman Development Team <pacman-dev at archlinux.org>.\n")"
+	printf '\n'
 	printf -- "$(gettext "\
-Copyright (c) 2010-2018 Pacman Development Team <pacman-dev at archlinux.org>.\n\
 This is free software; see the source for copying conditions.\n\
 There is NO WARRANTY, to the extent permitted by law.\n")"
 }
diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in
index ff460363..dd837c3f 100644
--- a/scripts/pacman-key.sh.in
+++ b/scripts/pacman-key.sh.in
@@ -92,8 +92,9 @@ usage() {

 version() {
 	printf "pacman-key (pacman) %s\n" "${myver}"
+	printf -- "$(gettext "Copyright (c) 2010-2018 Pacman Development Team <pacman-dev at archlinux.org>.\n")"
+	printf '\n'
 	printf -- "$(gettext "\
-Copyright (c) 2010-2018 Pacman Development Team <pacman-dev at archlinux.org>.\n\
 This is free software; see the source for copying conditions.\n\
 There is NO WARRANTY, to the extent permitted by law.\n")"
 }
diff --git a/scripts/pkgdelta.sh.in b/scripts/pkgdelta.sh.in
index 2dc12c28..72e063b0 100644
--- a/scripts/pkgdelta.sh.in
+++ b/scripts/pkgdelta.sh.in
@@ -70,8 +70,9 @@ This delta file can then be added to a database using repo-add.\n")"

 version() {
 	printf "pkgdelta (pacman) %s\n" "$myver"
+	printf -- "$(gettext "Copyright (c) 2009 Xavier Chantry <shiningxc at gmail.com>.\n")"
+	printf '\n'
 	printf -- "$(gettext "\
-Copyright (c) 2009 Xavier Chantry <shiningxc at gmail.com>.\n\n\
 This is free software; see the source for copying conditions.\n\
 There is NO WARRANTY, to the extent permitted by law.\n")"
 }
diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in
index 3f181404..86bf9a88 100644
--- a/scripts/repo-add.sh.in
+++ b/scripts/repo-add.sh.in
@@ -93,8 +93,9 @@ See %s(8) for more details and descriptions of the available options.\n")" $cmd
 version() {
 	cmd=${0##*/}
 	printf "%s (pacman) %s\n\n" "$cmd" "$myver"
+	printf -- "$(gettext "Copyright (c) 2006-2018 Pacman Development Team <pacman-dev at archlinux.org>.\n")"
+	printf '\n'
 	printf -- "$(gettext "\
-Copyright (c) 2006-2018 Pacman Development Team <pacman-dev at archlinux.org>\n\n\
 This is free software; see the source for copying conditions.\n\
 There is NO WARRANTY, to the extent permitted by law.\n")"
 }
--
2.17.0