From 327b05574f0dc1b1046c72401256ce5afd3e3247 Mon Sep 17 00:00:00 2001 From: Marcel Telka <marcel@telka.sk> Date: Tue, 02 Apr 2024 11:21:42 +0200 Subject: [PATCH] python/PyNUTClient: update to 2.8.2 --- tools/license-detector | 37 +++++++++++++++++++------------------ 1 files changed, 19 insertions(+), 18 deletions(-) diff --git a/tools/license-detector b/tools/license-detector index 01277c2..f70a8cd 100755 --- a/tools/license-detector +++ b/tools/license-detector @@ -19,17 +19,19 @@ function usage { [[ -n "$1" ]] && printf "ERROR: %s\n\n" "$1" >&2 - printf "Usage: license-detector [-d] LICENSE_FILE\n" >&2 + printf "Usage: license-detector [-d] [-l LICENSE] LICENSE_FILE\n" >&2 [[ -n "$1" ]] && exit 1 exit 0 } DEBUG=0 -while getopts ":hd" OPT ; do +LICENSE="*" +while getopts ":hdl:" OPT ; do case "$OPT" in "?"|"h") usage ;; "d") DEBUG=1 ;; + "l") LICENSE="*.$OPTARG" ;; esac done shift $((OPTIND - 1)) @@ -49,14 +51,14 @@ if grep -q -i "Artistic License" "$F" ; then if ! grep -q -i "Artistic License.*2" "$F" ; then - D="Artistic-1.0-TODO" + D= grep -q "7\. C subroutines" "$F" && grep -q "10\. THIS PACKAGE IS PROVIDED" "$F" && D="Artistic-1.0-Perl" grep -q "7\. C or perl subroutines" "$F" && grep -q "10\. THIS PACKAGE IS PROVIDED" "$F" && D="Artistic-1.0-cl8" grep -q "7\. C or perl subroutines" "$F" && grep -q "9\. THIS PACKAGE IS PROVIDED" "$F" && D="Artistic-1.0" else D="Artistic-2.0" fi - [[ -n "$L" ]] && L="$L OR " ; L="$L$D" + [[ -n "$L" && -n "$D" ]] && L="$L OR " ; L="$L$D" fi if grep -A 1 "GNU GENERAL PUBLIC LICENSE" "$F" | grep -q "Version 1, February 1989" ; then @@ -65,22 +67,11 @@ [[ -n "$L" ]] && L="$L OR " ; L="$L$D" fi -if grep -i -A 1 "GENERAL PUBLIC LICENSE" "$F" | grep -q "Version 2, June 1991" ; then - D="GPL-2.0-only" - grep -A 2 "GNU General Public License as published by the" "$F" | grep -q "or (at your option) any" && D="GPL-2.0-or-later" - [[ -n "$L" ]] && L="$L OR " ; L="$L$D" -fi - -if grep -A 1 "GNU LIBRARY GENERAL PUBLIC LICENSE" "$F" | grep -q "Version 2, June 1991" ; then - D="LGPL-2.0-only" - [[ -n "$L" ]] && L="$L OR " ; L="$L$D" -fi - TMPFILE=$(mktemp -q) [[ -z "$TMPFILE" ]] && printf "ERROR: Temporary file creation failed\n" >&2 && exit 1 typeset -A matched -for l in "$WS_TOOLS"/licenses/* ; do +for l in "$WS_TOOLS"/licenses/$LICENSE ; do [[ -f "$l" ]] || continue # skip filters [[ "$l" != "${l%.filter}" ]] && continue @@ -97,12 +88,22 @@ cat <<#EOF > "$TMPFILE" dos2unix -ascii \\ + | tr -d '\\014' \\ + | LC_ALL=C sed -E -e 's/^[[:space:]]+\$//g' \\ | awk '/^#/{next}/^\$/{\$0="\n"}1' ORS=' ' \\ - | sed -E -e 's/[[:space:]]+/ /g' -e 's/^ //' -e 's/ \$//' -e '/^\$/d' \\ + | LC_ALL=C sed -E -e 's/[[:space:]]+/ /g' -e 's/^ //' -e 's/ \$//' -e '/^\$/d' \\ EOF + # Remove some reStructuredText markup + if [[ "${F%.rst}" != "$F" ]] ; then + cat <<#EOF >> "$TMPFILE" + | sed -e '/^\*\*\$/d' -e 's/^\*\*\([^*]\)/\1/' -e 's/\([^*]\)\*\*\$/\1/' -e 's/\([^*]\)\*\*\([^*]\)/\1\2/g' \\ + EOF + fi # Apply filter if any - [[ -x "$l.filter" ]] && printf '\t| %s \\\n' "$l.filter" >> "$TMPFILE" + [[ -x "$l.filter" ]] && printf '\t| LC_ALL=C %s \\\n' "$l.filter" >> "$TMPFILE" cat <<#EOF >> "$TMPFILE" + | LC_ALL=C tr '[:upper:]' '[:lower:]' \\ + | sed -e 's|http://|https://|g' \ | tr ' ' '\\n' | fmt EOF -- Gitblit v1.9.3