Changeset 80335

Timestamp:

07/09/11 01:41:57 (4 years ago)

Author:

jmr@…

Message:

fix checking for existence of group on 10.5 (#30096)

Location:

trunk/base

Files:

• Makefile.in (modified) (1 diff)
• portmgr/dmg/postflight (modified) (2 diffs)

trunk/base/Makefile.in

@@ -40 +40 @@
 # create run user if it doesn't exist
         @if test -n "${DSCL}" -a -n "${DSEDITGROUP}" ; then \
-        if ! ${DSEDITGROUP} -q -o read ${RUNUSR} > /dev/null 2>&1 ; then \
+        if ! ${DSCL} -q . -read /Groups/${RUNUSR} > /dev/null 2>&1 ; then \
             if test `id -u` -eq 0; then \
                 echo "Creating group \"${RUNUSR}\"" ; \

trunk/base/portmgr/dmg/postflight

@@ -137 +137 @@
 function create_run_user {
     DSEDITGROUP=/usr/sbin/dseditgroup
-    if ! ${DSEDITGROUP} -q -o read ${RUNUSR} > /dev/null 2>&1 ; then
+    if ! ${DSCL} -q . -read /Groups/${RUNUSR} > /dev/null 2>&1 ; then
         echo "Creating group \"${RUNUSR}\""
         ${DSEDITGROUP} -q -o create -n . ${RUNUSR}
@@ -143 +143 @@
     if ! ${DSCL} -q . -list /Users/${RUNUSR} > /dev/null 2>&1 ; then
         echo "Creating user \"${RUNUSR}\""
-        ${DSCL} -q . -create /Users/${RUNUSR} Password *
+        ${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}')