From 4b4e4bf1aeb15be80e5cc9dee5921014626770ab Mon Sep 17 00:00:00 2001 From: Marcel Telka <marcel@telka.sk> Date: Sun, 31 Jul 2022 21:58:20 +0200 Subject: [PATCH] tools/perl-integrate-module: handle few more Copyright notice forms --- tools/perl-integrate-module | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/perl-integrate-module b/tools/perl-integrate-module index 9f64c94..9a41cec 100755 --- a/tools/perl-integrate-module +++ b/tools/perl-integrate-module @@ -310,11 +310,13 @@ [[ -n "$COPYRIGHT" ]] && break COPYRIGHT=$(gsed -e '0,/^# COPYRIGHT/d' -e '/^#/,$d' -e '/./,$!d' "$f" 2>/dev/null) [[ -n "$COPYRIGHT" ]] && break - COPYRIGHT=$(gsed -e '0,/LICENSE/d' -e '/^SEE/,$d' -e '/./,$!d' "$f" 2>/dev/null) + COPYRIGHT=$(gsed -e '0,/LICENSE/d' -e '/^REPOSITORY/,$d' -e '/^SEE/,$d' -e '/./,$!d' "$f" 2>/dev/null) [[ -n "$COPYRIGHT" ]] && break COPYRIGHT=$(gsed -e '0,/COPYING/d' -e '/^BUGS/,$d' -e '/^SEE/,$d' -e '/./,$!d' "$f" 2>/dev/null) [[ -n "$COPYRIGHT" ]] && break COPYRIGHT=$(gsed -e '0,/COPYRIGHT/d' -e '/^AUTHOR/,$d' -e '/^SEE/,$d' -e '/./,$!d' "$f" 2>/dev/null) + [[ -n "$COPYRIGHT" ]] && break + COPYRIGHT=$(gsed -e '0,/^## Copyright/d' -e '/./,$!d' "$f" 2>/dev/null) [[ -n "$COPYRIGHT" ]] && break done if [[ -z "$COPYRIGHT" ]] ; then @@ -341,7 +343,7 @@ printf "WARNING: No copyright notice found\n" >&2 > "$DISTRIBUTION.license" else - (printf "%s\n\n" "$COPYRIGHT" + (printf "%s\n\n" "$COPYRIGHT" | dos2unix -ascii i=75 ; while ((i)) ; do printf "=" ; i=$((i-1)) ; done printf "\n\n") > "$DISTRIBUTION.license" fi -- Gitblit v1.9.3