diff options
| author | triaxx <triaxx@pkgsrc.org> | 2019-11-10 10:25:43 +0000 |
|---|---|---|
| committer | triaxx <triaxx@pkgsrc.org> | 2019-11-10 10:25:43 +0000 |
| commit | b16ffcf9bd1b7d9e08c66da8c62de442c6334930 (patch) | |
| tree | a0f59656767a119feef84200057e088e34784ce1 /pkgtools | |
| parent | 6149581e789420f03add2e1ad6bc5cd56a7c1bb6 (diff) | |
| download | pkgsrc-b16ffcf9bd1b7d9e08c66da8c62de442c6334930.tar.gz | |
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@!
Diffstat (limited to 'pkgtools')
| -rwxr-xr-x | pkgtools/pkg_chk/files/pkg_chk.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgtools/pkg_chk/files/pkg_chk.sh b/pkgtools/pkg_chk/files/pkg_chk.sh index 6e86be00339..893c64a1c38 100755 --- a/pkgtools/pkg_chk/files/pkg_chk.sh +++ b/pkgtools/pkg_chk/files/pkg_chk.sh @@ -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 |