CVS commit: pkgsrc/pkgtools/pkg_chk/files

[Frédéric Fauberteau <triaxx%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Sun Nov 10 10:25:43 UTC 2019

Modified Files:
        pkgsrc/pkgtools/pkg_chk/files: pkg_chk.sh

Log Message:
pkg_chk: fix PR pkg/54675

Some OS (e.g. Arch Linux) do not have hostname in their base set of
packages.

pkgsrc changes:
---------------
  * Replace $(hostname) by $(uname -n).

Thanks jperkin@!


To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.76 pkgsrc/pkgtools/pkg_chk/files/pkg_chk.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/pkgtools/pkg_chk/files/pkg_chk.sh
diff -u pkgsrc/pkgtools/pkg_chk/files/pkg_chk.sh:1.75 pkgsrc/pkgtools/pkg_chk/files/pkg_chk.sh:1.76
--- pkgsrc/pkgtools/pkg_chk/files/pkg_chk.sh:1.75       Sun Nov 25 20:17:26 2018
+++ pkgsrc/pkgtools/pkg_chk/files/pkg_chk.sh    Sun Nov 10 10:25:43 2019
@@ -1,6 +1,6 @@
 #!@SH@ -e
 #
-# $Id: pkg_chk.sh,v 1.75 2018/11/25 20:17:26 martin Exp $
+# $Id: pkg_chk.sh,v 1.76 2019/11/10 10:25:43 triaxx Exp $
 #
 # TODO: Make -g check dependencies and tsort
 # TODO: Make -g list user-installed packages first, followed by commented
@@ -271,7 +271,7 @@ extract_variables()
        fi
     fi
     if [ -z "$PKGCHK_UPDATE_CONF" ];then
-       PKGCHK_UPDATE_CONF=$PKGSRCDIR/pkgchk_update-$(hostname).conf
+       PKGCHK_UPDATE_CONF=$PKGSRCDIR/pkgchk_update-$(uname -n).conf
     fi
     }
 
@@ -471,7 +471,7 @@ determine_tags()
        extract_make_vars Makefile OPSYS OS_VERSION MACHINE_ARCH
     fi
 
-    TAGS="$(hostname | ${SED} -e 's,\..*,,'),$(hostname),$OPSYS-$OS_VERSION-$MACHINE_ARCH,$OPSYS-$OS_VERSION,$OPSYS-$MACHINE_ARCH,$OPSYS,$OS_VERSION,$MACHINE_ARCH"
+    TAGS="$(uname -n | ${SED} -e 's,\..*,,'),$(uname -n),$OPSYS-$OS_VERSION-$MACHINE_ARCH,$OPSYS-$OS_VERSION,$OPSYS-$MACHINE_ARCH,$OPSYS,$OS_VERSION,$MACHINE_ARCH"
     if [ -f /usr/X11R7/lib/libX11.a -o -f /usr/X11R6/lib/libX11.a ];then
        TAGS="$TAGS,x11"
     fi