From 11913f259bd613261d3ccc0301874e26a4dcdbab Mon Sep 17 00:00:00 2001 From: Andreas Wacknitz <A.Wacknitz@gmx.de> Date: Sun, 31 Mar 2024 18:36:29 +0200 Subject: [PATCH] nodejs-18: update to 18.20.0 --- tools/perl-integrate-module | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) diff --git a/tools/perl-integrate-module b/tools/perl-integrate-module index 3339070..a4b8e24 100755 --- a/tools/perl-integrate-module +++ b/tools/perl-integrate-module @@ -175,6 +175,9 @@ fi +# Remove everything that is not in git +rm -rf * +git checkout . > /dev/null 2>&1 # Remove everything from git (except known patches, files, history, and $CONF) [[ -f "$CONF" ]] && grep "^%patch%" "$CONF" | while read TAG PATCH ; do rm -f "patches/$PATCH" ; done [[ -f "$CONF" ]] && grep "^%file%" "$CONF" | while read TAG FILE ; do rm -f "files/$FILE" ; done @@ -194,13 +197,16 @@ # Makefile template +GENERATE_CMD="\$WS_TOOLS/$THIS" +[[ "$DIRECTORY" != "perl/$DISTRIBUTION" ]] && GENERATE_CMD="$GENERATE_CMD -d $DIRECTORY" +GENERATE_CMD="$GENERATE_CMD $MODULE" ( cat $WS_TOP/transforms/copyright-template | sed -e '/^$/,$d' cat <<EOF # # This file was automatically generated using the following command: -# \$WS_TOOLS/$THIS $MODULE +# $GENERATE_CMD # BUILD_STYLE = makemaker @@ -236,7 +242,7 @@ COMPONENT_ARCHIVE_URL=$($GMAKE print-value-COMPONENT_ARCHIVE_URL) [[ "$COMPONENT_ARCHIVE_URL" == "$DOWNLOAD_URL" ]] && DOWNLOAD_URL= fi -[[ -n "$DOWNLOAD_URL" ]] && sed -i -e $'s|^COMPONENT_CPAN_AUTHOR.*|COMPONENT_ARCHIVE_URL=\t\t'"$DOWNLOAD_URL"'|' Makefile +[[ -n "$DOWNLOAD_URL" ]] && sed -i -e $'s|^COMPONENT_CPAN_AUTHOR.*|COMPONENT_ARCHIVE_URL =\t\t\\\\\\\n\t'"$DOWNLOAD_URL"'|' Makefile # Remove COMPONENT_REVISION if not needed COMPONENT_VERSION=$($GMAKE print-value-COMPONENT_VERSION) @@ -256,8 +262,12 @@ ! $GMAKE patch > /dev/null 2>&1 && printf "FATAL: 'gmake patch' failed!\n" >&2 && exit 1 # Refresh patches -! $GMAKE refresh-patches > /dev/null 2>&1 && printf "FATAL: 'gmake refresh-patches' failed!\n" >&2 && exit 1 -git add patches 2>/dev/null +if $GMAKE refresh-patches > /dev/null 2>&1 ; then + git add patches 2>/dev/null +else + printf "ERROR: 'gmake refresh-patches' failed!\n" >&2 + git checkout patches 2>/dev/null +fi # Cleanup after patch refresh $GMAKE clobber > /dev/null 2>&1 -- Gitblit v1.9.3