From 959c2140adbd1be7f0702670cf6502aef44b84c5 Mon Sep 17 00:00:00 2001
From: sborrill <sborrill@pkgsrc.org>
Date: Wed, 15 Apr 2020 13:33:32 +0000
Subject: 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
---
 mk/pkginstall/files | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'mk')

diff --git a/mk/pkginstall/files b/mk/pkginstall/files
index 33d1361ea05..c429a9a3cd9 100644
--- a/mk/pkginstall/files
+++ b/mk/pkginstall/files
@@ -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"
 
-- 
cgit v1.2.3