[pkgsrc/trunk]: pkgsrc/mk/pkginstall Be more conservative and avoid possible ...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/531740d8bb23
branches:  trunk
changeset: 516348:531740d8bb23
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Jul 19 22:26:26 2006 +0000

description:
Be more conservative and avoid possible shell implementation differences
by not using `...` inside ${...#...}.

diffstat:

 mk/pkginstall/dirs       |  6 ++++--
 mk/pkginstall/files      |  5 +++--
 mk/pkginstall/fonts      |  6 ++++--
 mk/pkginstall/header     |  5 +++--
 mk/pkginstall/info-files |  5 +++--
 mk/pkginstall/perms      |  6 ++++--
 mk/pkginstall/shell      |  5 +++--
 mk/pkginstall/usergroup  |  6 ++++--
 8 files changed, 28 insertions(+), 16 deletions(-)

diffs (158 lines):

diff -r 1c426a8a7ef1 -r 531740d8bb23 mk/pkginstall/dirs
--- a/mk/pkginstall/dirs        Wed Jul 19 22:07:13 2006 +0000
+++ b/mk/pkginstall/dirs        Wed Jul 19 22:26:26 2006 +0000
@@ -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 @@
 
 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 -r 1c426a8a7ef1 -r 531740d8bb23 mk/pkginstall/files
--- a/mk/pkginstall/files       Wed Jul 19 22:07:13 2006 +0000
+++ b/mk/pkginstall/files       Wed Jul 19 22:26:26 2006 +0000
@@ -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 @@
        ${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 -r 1c426a8a7ef1 -r 531740d8bb23 mk/pkginstall/fonts
--- a/mk/pkginstall/fonts       Wed Jul 19 22:07:13 2006 +0000
+++ b/mk/pkginstall/fonts       Wed Jul 19 22:26:26 2006 +0000
@@ -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 @@
 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 -r 1c426a8a7ef1 -r 531740d8bb23 mk/pkginstall/header
--- a/mk/pkginstall/header      Wed Jul 19 22:07:13 2006 +0000
+++ b/mk/pkginstall/header      Wed Jul 19 22:26:26 2006 +0000
@@ -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 @@
 TRUE="@TRUE@"
 XARGS="@XARGS@"
 
-: ${PKG_METADATA_DIR=`${PWD_CMD}`}
+CURDIR=`${PWD_CMD}`
+: ${PKG_METADATA_DIR=${CURDIR}}
 PKGBASE="@PKGBASE@"
 
 LOCALBASE="@LOCALBASE@"
diff -r 1c426a8a7ef1 -r 531740d8bb23 mk/pkginstall/info-files
--- a/mk/pkginstall/info-files  Wed Jul 19 22:07:13 2006 +0000
+++ b/mk/pkginstall/info-files  Wed Jul 19 22:26:26 2006 +0000
@@ -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 @@
 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 -r 1c426a8a7ef1 -r 531740d8bb23 mk/pkginstall/perms
--- a/mk/pkginstall/perms       Wed Jul 19 22:07:13 2006 +0000
+++ b/mk/pkginstall/perms       Wed Jul 19 22:26:26 2006 +0000
@@ -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 @@
 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 -r 1c426a8a7ef1 -r 531740d8bb23 mk/pkginstall/shell
--- a/mk/pkginstall/shell       Wed Jul 19 22:07:13 2006 +0000
+++ b/mk/pkginstall/shell       Wed Jul 19 22:26:26 2006 +0000
@@ -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 @@
 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 -r 1c426a8a7ef1 -r 531740d8bb23 mk/pkginstall/usergroup
--- a/mk/pkginstall/usergroup   Wed Jul 19 22:07:13 2006 +0000
+++ b/mk/pkginstall/usergroup   Wed Jul 19 22:26:26 2006 +0000
@@ -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 @@
 
 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}