From e8f08c50443d9c168060587131279dd1629547b7 Mon Sep 17 00:00:00 2001 From: 0x5c Date: Mon, 2 May 2022 00:58:34 -0400 Subject: [PATCH] testtest --- common/travis/xlint.sh | 14 +++++++++++++- srcpkgs/net-tools/template | 5 +++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/common/travis/xlint.sh b/common/travis/xlint.sh index 6b3d9e91c90a..5ff2d907ff1d 100755 --- a/common/travis/xlint.sh +++ b/common/travis/xlint.sh @@ -11,7 +11,19 @@ common/scripts/lint-commits $base $tip || EXITCODE=$? for t in $(awk '{ print "srcpkgs/" $0 "/template" }' /tmp/templates); do /bin/echo -e "\x1b[32mLinting $t...\x1b[0m" - xlint "$t" || EXITCODE=$? + xlint "$t" > /tmp/lint_out || EXITCODE=$? +# if [ "$?" -ne 0 ]; then + awk '{ + split($0, a, ": ") + split(a[1], b, ":") + msg = substr($0, index($0, ": ") + 2) + if (b[2]) { + line = ",line=" b[2] + } + print $0 + printf "::error title=xlint,file=%s%s::%s\n", b[1], line, msg + }' /tmp/lint_out +# fi common/scripts/lint-version-change "$t" $base $tip || EXITCODE=$? done exit $EXITCODE diff --git a/srcpkgs/net-tools/template b/srcpkgs/net-tools/template index 384feba77fb9..f546e7c72452 100644 --- a/srcpkgs/net-tools/template +++ b/srcpkgs/net-tools/template @@ -1,4 +1,4 @@ -# Template file for 'net-tools' +# Template file for 'net-toolz' pkgname=net-tools version=1.60.20181103git revision=1 @@ -8,9 +8,10 @@ short_desc="Basic networking tools" maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://github.com/ecki/net-tools" -distfiles="https://github.com/ecki/net-tools/archive/${_githash}.tar.gz" +dissfiles="https://github.com/ecki/net-tools/archive/${_githash}.tar.gz" checksum=795cb4dd2618ed7ff9a48b9cb63b33780b47dfd7464c8e52ba734e6796cbab17 + alternatives=" ifconfig:ifconfig:/usr/bin/${pkgname}-ifconfig ifconfig:/usr/share/man/man1/ifconfig.1:/usr/share/man/man8/${pkgname}-ifconfig.8