[pkgsrc/trunk]: pkgsrc/mk/platform Collapse ROOT_CMD a little; it's possible ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8bfc420c70cb
branches:  trunk
changeset: 482540:8bfc420c70cb
user:      tv <tv%pkgsrc.org@localhost>
date:      Fri Oct 29 14:53:39 2004 +0000

description:
Collapse ROOT_CMD a little; it's possible to make all invocations do the
$(id -un ...) dance for canonical naming.

diffstat:

 mk/platform/Interix.mk |  11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)

diffs (25 lines):

diff -r 1bb6c3ad9d54 -r 8bfc420c70cb mk/platform/Interix.mk
--- a/mk/platform/Interix.mk    Fri Oct 29 14:51:41 2004 +0000
+++ b/mk/platform/Interix.mk    Fri Oct 29 14:53:39 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Interix.mk,v 1.7 2004/10/13 17:50:01 tv Exp $
+# $NetBSD: Interix.mk,v 1.8 2004/10/29 14:53:39 tv Exp $
 #
 # Variable definitions for the Interix operating system.
 
@@ -96,13 +96,8 @@
 NOLOGIN?=              /bin/false
 PKG_TOOLS_BIN?=                ${LOCALBASE}/sbin
 PKGDIRMODE?=           775
-.if ${BINOWN} == 197108
-# If Administrator, BINOWN is exactly this numeric value, so transform it to
-# a locale-specific name.  (pkgsrc/bootstrap sets all other users to names.)
-ROOT_CMD?=             ${SU} - "$$(id -un 197108)" -c
-.else
-ROOT_CMD?=             ${SU} - ${ROOT_USER} -c
-.endif
+# ROOT_USER might be numeric in the special case of Administrator; canonify it:
+ROOT_CMD?=             ${SU} - "$$(id -un ${ROOT_USER})" -c
 ROOT_USER?=            ${BINOWN}
 ROOT_GROUP?=           131616 # +Administrators or native language equivalent
 TOUCH_FLAGS?=