Be more conservative and avoid possible shell implementation differences

by not using `...` inside ${...#...}.

8 files changed, 28 insertions, 16 deletions

diff --git a/mk/pkginstall/dirs b/mk/pkginstall/dirs
index 361060edade..665dbaf4767 100644
--- a/mk/pkginstall/dirs
+++ b/mk/pkginstall/dirs
@@ -1,4 +1,4 @@
-# $NetBSD: dirs,v 1.1 2006/05/21 23:50:15 jlam Exp $
+# $NetBSD: dirs,v 1.2 2006/07/19 22:26:26 jlam Exp $
 #
 # Generate a +DIRS script that reference counts directories that are
 # required for the proper functioning of the package.
@@ -67,7 +67,9 @@ TRUE="@TRUE@"
 
 SELF=$0
 ACTION=$1
-PKG_METADATA_DIR="${2-`${PWD_CMD}`}"
+
+CURDIR=`${PWD_CMD}`
+PKG_METADATA_DIR="${2-${CURDIR}}"
 : ${PKGNAME=${PKG_METADATA_DIR##*/}}
 : ${PKG_DBDIR=${PKG_METADATA_DIR%/*}}
 : ${PKG_REFCOUNT_DBDIR=${PKG_DBDIR}.refcount}
diff --git a/mk/pkginstall/files b/mk/pkginstall/files
index aad8bb1062a..5ab7d98009e 100644
--- a/mk/pkginstall/files
+++ b/mk/pkginstall/files
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.1 2006/05/21 23:50:15 jlam Exp $
+# $NetBSD: files,v 1.2 2006/07/19 22:26:26 jlam Exp $
 #
 # Generate a +FILES script that reference counts config files that are
 # required for the proper functioning of the package.
@@ -105,7 +105,8 @@ VIEW-REMOVE)
 	${TEST} -n "${DEPOTDIR}" -a -n "${VIEWDIR}" || exit 0
 	;;
 *)
-	PKG_METADATA_DIR="${2-`${PWD_CMD}`}"
+	CURDIR=`${PWD_CMD}`
+	PKG_METADATA_DIR="${2-${CURDIR}}"
 	: ${PKGNAME=${PKG_METADATA_DIR##*/}}
 	: ${PKG_DBDIR=${PKG_METADATA_DIR%/*}}
 	: ${PKG_REFCOUNT_DBDIR=${PKG_DBDIR}.refcount}
diff --git a/mk/pkginstall/fonts b/mk/pkginstall/fonts
index 52c68387fa3..e60dd268faf 100644
--- a/mk/pkginstall/fonts
+++ b/mk/pkginstall/fonts
@@ -1,4 +1,4 @@
-# $NetBSD: fonts,v 1.1 2006/05/21 23:50:15 jlam Exp $
+# $NetBSD: fonts,v 1.2 2006/07/19 22:26:26 jlam Exp $
 #
 # Generate a +FONTS script that updates font databases for the package.
 #
@@ -39,7 +39,9 @@ TTMKFDIR="@TTMKFDIR@"
 TYPE1INST="@TYPE1INST@"
 
 SELF=$0
-PKG_METADATA_DIR="${1-`${PWD_CMD}`}"
+
+CURDIR=`${PWD_CMD}`
+PKG_METADATA_DIR="${1-${CURDIR}}"
 : ${PKGNAME=${PKG_METADATA_DIR##*/}}
 : ${PKG_PREFIX=@PREFIX@}
 
diff --git a/mk/pkginstall/header b/mk/pkginstall/header
index 47c91b7981e..42bdc29f624 100644
--- a/mk/pkginstall/header
+++ b/mk/pkginstall/header
@@ -1,6 +1,6 @@
 #!@SH@
 #
-# $NetBSD: header,v 1.1 2006/05/21 23:50:15 jlam Exp $
+# $NetBSD: header,v 1.2 2006/07/19 22:26:26 jlam Exp $
 
 SELF="$0"
 PKGNAME="$1"
@@ -48,7 +48,8 @@ TR="@TR@"
 TRUE="@TRUE@"
 XARGS="@XARGS@"
 
-: ${PKG_METADATA_DIR=`${PWD_CMD}`}
+CURDIR=`${PWD_CMD}`
+: ${PKG_METADATA_DIR=${CURDIR}}
 PKGBASE="@PKGBASE@"
 
 LOCALBASE="@LOCALBASE@"
diff --git a/mk/pkginstall/info-files b/mk/pkginstall/info-files
index ae68d087e11..3c8cb44eed3 100644
--- a/mk/pkginstall/info-files
+++ b/mk/pkginstall/info-files
@@ -1,4 +1,4 @@
-# $NetBSD: info-files,v 1.1 2006/05/21 23:50:15 jlam Exp $
+# $NetBSD: info-files,v 1.2 2006/07/19 22:26:26 jlam Exp $
 #
 # Generate an +INFO_FILES script that handles info file registration for
 # the package.
@@ -43,7 +43,8 @@ TEST="@TEST@"
 SELF=$0
 ACTION=$1
 
-PKG_METADATA_DIR="${2-`${PWD_CMD}`}"
+CURDIR=`${PWD_CMD}`
+PKG_METADATA_DIR="${2-${CURDIR}}"
 : ${PKGNAME=${PKG_METADATA_DIR##*/}}
 : ${PKG_PREFIX=@PREFIX@}
 
diff --git a/mk/pkginstall/perms b/mk/pkginstall/perms
index 2f898469d55..c6c895b8a6b 100644
--- a/mk/pkginstall/perms
+++ b/mk/pkginstall/perms
@@ -1,4 +1,4 @@
-# $NetBSD: perms,v 1.1 2006/05/21 23:50:15 jlam Exp $
+# $NetBSD: perms,v 1.2 2006/07/19 22:26:26 jlam Exp $
 #
 # Generate a +PERMS script that sets the special permissions on files
 # and directories used by the package.
@@ -35,7 +35,9 @@ SORT="@SORT@"
 TEST="@TEST@"
 
 SELF=$0
-PKG_METADATA_DIR="${1-`${PWD_CMD}`}"
+
+CURDIR=`${PWD_CMD}`
+PKG_METADATA_DIR="${1-${CURDIR}}"
 : ${PKGNAME=${PKG_METADATA_DIR##*/}}
 : ${PKG_PREFIX=@PREFIX@}
 
diff --git a/mk/pkginstall/shell b/mk/pkginstall/shell
index 6f46ba6b814..9a99613bb14 100644
--- a/mk/pkginstall/shell
+++ b/mk/pkginstall/shell
@@ -1,4 +1,4 @@
-# $NetBSD: shell,v 1.2 2006/07/11 13:28:32 wiz Exp $
+# $NetBSD: shell,v 1.3 2006/07/19 22:26:26 jlam Exp $
 #
 # Generate a +SHELL script that handles shell registration for the package.
 #
@@ -44,7 +44,8 @@ TOUCH="@TOUCH@"
 SELF=$0
 ACTION=$1
 
-PKG_METADATA_DIR="${2-`${PWD_CMD}`}"
+CURDIR=`${PWD_CMD}`
+PKG_METADATA_DIR="${2-${CURDIR}}"
 : ${PKG_PREFIX=@PREFIX@}
 : ${PKGNAME=${PKG_METADATA_DIR##*/}}
 
diff --git a/mk/pkginstall/usergroup b/mk/pkginstall/usergroup
index 9d89271f35d..95509188d3c 100644
--- a/mk/pkginstall/usergroup
+++ b/mk/pkginstall/usergroup
@@ -1,4 +1,4 @@
-# $NetBSD: usergroup,v 1.1 2006/05/21 23:50:15 jlam Exp $
+# $NetBSD: usergroup,v 1.2 2006/07/19 22:26:26 jlam Exp $
 #
 # Generate a +USERGROUP script that reference-counts users and groups
 # that are required for the proper functioning of the package.
@@ -63,7 +63,9 @@ TRUE="@TRUE@"
 
 SELF=$0
 ACTION=$1
-PKG_METADATA_DIR="${2-`${PWD_CMD}`}"
+
+CURDIR=`${PWD_CMD}`
+PKG_METADATA_DIR="${2-${CURDIR}}"
 : ${PKGNAME=${PKG_METADATA_DIR##*/}}
 : ${PKG_DBDIR=${PKG_METADATA_DIR%/*}}
 : ${PKG_REFCOUNT_DBDIR=${PKG_DBDIR}.refcount}