Changeset 79693

Timestamp:

06/23/11 10:36:07 (4 years ago)

Author:

jmr@…

Message:

merge r79692 from trunk:

use 'id -u' in Makefile to check if we're root, rather than $USER

Location:

branches/release_2_0

Files:

• . (modified) (1 prop)
• base (modified) (1 prop)
• base/Makefile.in (modified) (2 diffs)
• base/portmgr/fedora/macports.spec (modified) (1 prop)
• base/src/pextlib1.0/sha2.c (modified) (1 prop)
• base/src/pextlib1.0/sha2.h (modified) (1 prop)
• base/src/pextlib1.0/sha256cmd.c (modified) (1 prop)
• base/src/pextlib1.0/sha256cmd.h (modified) (1 prop)
• base/src/registry2.0/receipt_sqlite.tcl (modified) (1 prop)

branches/release_2_0/base/Makefile.in

@@ -41 +41 @@
         @if test -n "${DSCL}" -a -n "${DSEDITGROUP}" ; then \
         if ! ${DSEDITGROUP} -q -o read ${RUNUSR} > /dev/null 2>&1 ; then \
-            if test $$USER = root; then \
+            if test `id -u` -eq 0; then \
                 echo "Creating group \"${RUNUSR}\"" ; \
                 ${DSEDITGROUP} -q -o create -n . ${RUNUSR} ; \
@@ -49 +49 @@
         fi ; \
         if ! ${DSCL} -q . -list /Users/${RUNUSR} > /dev/null 2>&1 ; then \
-            if test $$USER = root; then \
+            if test `id -u` -eq 0; then \
                 echo "Creating user \"${RUNUSR}\"" ; \
                 ${DSCL} -q . -create /Users/${RUNUSR} Password \* ; \