[81415] trunk/base

[jmr at macports.org]

Revision: 81415
          http://trac.macports.org/changeset/81415
Author:   jmr at macports.org
Date:     2011-07-29 22:50:18 -0700 (Fri, 29 Jul 2011)
Log Message:
-----------
also avoid uid collision in postflight script, and use DSCL variable in Makefile

Modified Paths:
--------------
    trunk/base/Makefile.in
    trunk/base/portmgr/dmg/postflight

Modified: trunk/base/Makefile.in
===================================================================
--- trunk/base/Makefile.in	2011-07-30 05:44:03 UTC (rev 81414)
+++ trunk/base/Makefile.in	2011-07-30 05:50:18 UTC (rev 81415)
@@ -51,7 +51,7 @@
             if test `id -u` -eq 0; then \
                 echo "Creating user \"${RUNUSR}\"" ; \
                 NEXTUID=501; \
-                while test -n "`dscl -q /Search -search /Users UniqueID $$NEXTUID`"; do \
+                while test -n "`${DSCL} -q /Search -search /Users UniqueID $$NEXTUID`"; do \
                     let "NEXTUID=NEXTUID+1"; \
                 done; \
                 ${DSCL} -q . -create /Users/${RUNUSR} UniqueID $$NEXTUID ; \

Modified: trunk/base/portmgr/dmg/postflight
===================================================================
--- trunk/base/portmgr/dmg/postflight	2011-07-30 05:44:03 UTC (rev 81414)
+++ trunk/base/portmgr/dmg/postflight	2011-07-30 05:50:18 UTC (rev 81415)
@@ -142,8 +142,12 @@
     fi
     if ! ${DSCL} -q . -list /Users/${RUNUSR} > /dev/null 2>&1 ; then
         echo "Creating user \"${RUNUSR}\""
+        NEXTUID=501
+        while [[ -n "`${DSCL} -q /Search -search /Users UniqueID $NEXTUID`" ]]; do
+            let "NEXTUID=NEXTUID+1"
+        done
+        ${DSCL} -q . -create /Users/${RUNUSR} UniqueID $NEXTUID
         ${DSCL} -q . -create /Users/${RUNUSR} Password \*
-        ${DSCL} -q . -create /Users/${RUNUSR} UniqueID $(($(${DSCL} . -list /Users UniqueID | /usr/bin/awk '{print $2}' | sort -ug | tail -1)+1))
         ${DSCL} -q . -create /Users/${RUNUSR} PrimaryGroupID $(${DSCL} -q . -read /Groups/${RUNUSR} PrimaryGroupID | /usr/bin/awk '{print $2}')
         ${DSCL} -q . -create /Users/${RUNUSR} NFSHomeDirectory /var/empty
         ${DSCL} -q . -create /Users/${RUNUSR} UserShell /usr/bin/false
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110729/eeb0b31e/attachment.html>