CVS commit: pkgsrc/mk/pkginstall

["Stephen Borrill" <sborrill%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   sborrill
Date:           Wed Apr 15 13:33:32 UTC 2020

Modified Files:
        pkgsrc/mk/pkginstall: files

Log Message:
Work around a potential shell bug where "${FOO=${BAR%/*}}" does not work
if quoted. Seen on NetBSD 7.

#!/bin/sh
in="/path/to/dir with space/file"

: "${file=${in##*/}}"
: "${dir=${in%/*}}"
echo "dir:$dir"
echo "file:$file"
[ "$dir" = "$file" ] && echo "dir and file are same"

Leads to errors when adding packages such as:
./+FILES: cannot create /var/db/pkg.refcount/files/etc/rc.d/xenguest//var/db/pkg/xe-guest-utilities-7.0.0: directory nonexistent


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/mk/pkginstall/files

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

Modified files:

Index: pkgsrc/mk/pkginstall/files
diff -u pkgsrc/mk/pkginstall/files:1.10 pkgsrc/mk/pkginstall/files:1.11
--- pkgsrc/mk/pkginstall/files:1.10     Tue Feb 11 01:21:25 2020
+++ pkgsrc/mk/pkginstall/files  Wed Apr 15 13:33:32 2020
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.10 2020/02/11 01:21:25 rillig Exp $
+# $NetBSD: files,v 1.11 2020/04/15 13:33:32 sborrill Exp $
 #
 # Generate a +FILES script that reference counts config files that are
 # required for the proper functioning of the package.
@@ -98,8 +98,8 @@ esac
 
 CURDIR=`${PWD_CMD}`
 PKG_METADATA_DIR="${2-${CURDIR}}"
-: "${PKGNAME=${PKG_METADATA_DIR##*/}}"
-: "${PKG_DBDIR=${PKG_METADATA_DIR%/*}}"
+: ${PKGNAME="${PKG_METADATA_DIR##*/}"}
+: ${PKG_DBDIR="${PKG_METADATA_DIR%/*}"}
 : "${PKG_REFCOUNT_DBDIR=${PKG_DBDIR}.refcount}"
 PKG_REFCOUNT_FILES_DBDIR="${PKG_REFCOUNT_DBDIR}/files"