[gentoo-commits] proj/netifrc:master commit in: mk/

[gentoo-commits] proj/netifrc:master commit in: mk/

[Sam James]

commit:     eb7d352d007d15bb577a284a2663eb58129b8db5
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 17 04:36:30 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Apr 17 04:36:30 2023 +0000
URL:        https://gitweb.gentoo.org/proj/netifrc.git/commit/?id=eb7d352d

mk/dist.mk: use gtar for --owners

Signed-off-by: Sam James <sam <AT> gentoo.org>

 mk/dist.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mk/dist.mk b/mk/dist.mk
index 383826a..7404f04 100644
--- a/mk/dist.mk
+++ b/mk/dist.mk
@@ -23,12 +23,12 @@ dist:
 	mkdir $${D}/${DISTPREFIX} && \
 	git checkout-index -f -a --prefix=$${D}/${DISTPREFIX}/ && \
 	git log >$${D}/${DISTPREFIX}/ChangeLog && \
-	tar cjf ${DISTFILE} --owner=0 --group=0 --format=posix --mode=a+rX -C $$D ${DISTPREFIX} && \
+	gtar cjf ${DISTFILE} --owner=0 --group=0 --format=posix --mode=a+rX -C $$D ${DISTPREFIX} && \
 	rm -rf $$D '
 
 distcheck: dist
 	rm -rf ${DISTPREFIX}
-	tar xf ${DISTFILE}
+	gtar xf ${DISTFILE}
 	MAKEFLAGS= $(MAKE) -C ${DISTPREFIX}
 	MAKEFLAGS= $(MAKE) -C ${DISTPREFIX} check
 	rm -rf ${DISTPREFIX}
@@ -39,7 +39,7 @@ snapshot:
 	cp -RPp * /tmp/${SNAPDIR}
 	(cd /tmp/${SNAPDIR}; make clean)
 	find /tmp/${SNAPDIR} -name .svn -exec rm -rf -- {} \; 2>/dev/null || true
-	tar -cvjpf ${SNAPFILE} -C /tmp ${SNAPDIR}
+	gtar -cvjpf ${SNAPFILE} -C /tmp ${SNAPDIR}
 	rm -rf /tmp/${SNAPDIR}
 	ls -l ${SNAPFILE}
 

[gentoo-commits] proj/netifrc:master commit in: mk/

[Sam James]

commit:     a058cb072fcd8f2874513e4ca58f92482e2a191b
Author:     Matoro Mahri <matoro_gentoo <AT> matoro <DOT> tk>
AuthorDate: Sat Jan 13 05:14:01 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 14 04:47:25 2024 +0000
URL:        https://gitweb.gentoo.org/proj/netifrc.git/commit/?id=a058cb07

mk/os.mk: don't use OS env var for overriding

If you want to override the OS or OS-detect command you can still use
_OS and _OS_SH, but OS is too common of an environment variable to
listen for.

Closes: https://bugs.gentoo.org/906171
Signed-off-by: Matoro Mahri <matoro_gentoo <AT> matoro.tk>
Closes: https://github.com/gentoo/netifrc/pull/52
Signed-off-by: Sam James <sam <AT> gentoo.org>

 mk/os.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mk/os.mk b/mk/os.mk
index c306f05..cf089e7 100644
--- a/mk/os.mk
+++ b/mk/os.mk
@@ -5,7 +5,7 @@
 
 _OS_SH=		uname -s
 _OS:= 		$(shell ${_OS_SH})
-OS?= 		${_OS}
+OS= 		${_OS}
 include ${MK}/os-${OS}.mk
 
 RC_LIB=		/$(LIBNAME)/rc

[gentoo-commits] proj/netifrc:master commit in: mk/

[Sam James]

commit:     addb593e370c7d8fd38f3eb81e15837306d576ff
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 17 04:37:19 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Apr 17 04:37:32 2023 +0000
URL:        https://gitweb.gentoo.org/proj/netifrc.git/commit/?id=addb593e

mk/dist.mk: use xz

Signed-off-by: Sam James <sam <AT> gentoo.org>

 mk/dist.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mk/dist.mk b/mk/dist.mk
index 7404f04..1625d7c 100644
--- a/mk/dist.mk
+++ b/mk/dist.mk
@@ -4,18 +4,18 @@
 
 GITREF?=	HEAD
 DISTPREFIX?=	${NAME}-${VERSION}
-DISTFILE?=	${DISTPREFIX}.tar.bz2
+DISTFILE?=	${DISTPREFIX}.tar.xz
 
-CLEANFILES+=	${NAME}-*.tar.bz2
+CLEANFILES+=	${NAME}-*.tar.xz
 
 _SNAP_SH=	date -u +%Y%m%d%H%M
 _SNAP:=		$(shell ${_SNAP_SH})
 SNAP=		${_SNAP}
 SNAPDIR=	${DISTPREFIX}-${SNAP}
-SNAPFILE=	${SNAPDIR}.tar.bz2
+SNAPFILE=	${SNAPDIR}.tar.xz
 
 gitdist:
-	git archive --prefix=${DISTPREFIX}/ ${GITREF} | bzip2 > ${DISTFILE}
+	git archive --prefix=${DISTPREFIX}/ ${GITREF} | xz > ${DISTFILE}
 
 dist:
 	sh -c ' \

[gentoo-commits] proj/netifrc:master commit in: mk/

[Robin H. Johnson]

commit:     7a7e77357cca8d3e530cb96cf7a6ea0d879ba8e6
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 21 05:16:49 2019 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Apr 21 05:16:49 2019 +0000
URL:        https://gitweb.gentoo.org/proj/netifrc.git/commit/?id=7a7e7735

shellcheck: turn off some checks to start

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 mk/scripts.mk | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/mk/scripts.mk b/mk/scripts.mk
index 7e512f0..d278ac1 100644
--- a/mk/scripts.mk
+++ b/mk/scripts.mk
@@ -14,7 +14,13 @@ _LCL_SED:=		$(shell ${_LCL_SED_SH})
 
 SED_REPLACE=		-e 's:@SHELL@:${SH}:g' -e 's:@LIB@:${LIBNAME}:g' -e 's:@SYSCONFDIR@:${SYSCONFDIR}:g' -e 's:@CONFDIR@:${CONFDIR}:g' -e 's:@LIBEXECDIR@:${LIBEXECDIR}:g' -e 's:@PREFIX@:${PREFIX}:g' -e 's:@BINDIR@:${BINDIR}:g' -e 's:@SBINDIR@:${SBINDIR}:g' -e 's:@INITDIR@:${INITDIR}:g' ${_PKG_SED} ${_LCL_SED}
 
-SHELLCHECK_CMD = shellcheck -s sh --exclude SC1008 -f gcc
+# SC1008: shebang
+# SC2039: warning: In POSIX sh, 'local' is undefined.
+# SC2086: splitting
+# SC2155: declare/assign
+# warning: domain is referenced but not assigned. [SC2154]
+# note: Don't use variables in the printf format string. Use printf "..%s.." "$foo". [SC2059]
+SHELLCHECK_CMD = shellcheck -s sh --exclude SC1008,SC2039,SC2086,SC2155,SC2154,SC2059 -f gcc
 
 # Tweak our shell scripts
 %.sh: %.sh.in
@@ -57,7 +63,8 @@ CLEANFILES+=	${OBJS}
 clean:
 	@if test -n "${CLEANFILES}"; then echo "rm -f ${CLEANFILES}"; rm -f ${CLEANFILES}; fi
 
-shellcheck: ${SRCS}
-	@$(SHELLCHECK_CMD) $<
+shellcheck: $(filter net.lo.in net.example.in %.sh.in, ${SRCS}) $(filter %.sh, ${INC})
+	@${ECHO} CHECKING $^
+	@$(SHELLCHECK_CMD) $^
 
 include ${MK}/gitignore.mk