Play catchup with Apple dscl's API churn

diff --git a/scripts/setup.in b/scripts/setup.in
index bf47f248dda058f6e183449db66a58bc9a4fab2e..dc8ca9b8946ae44677a91a72bd411deacb20bece 100755 (executable)
--- a/scripts/setup.in
+++ b/scripts/setup.in
@@ -220,32 +220,32 @@ pick() {
 case $os in
 Mac )
   # Apple don't seem to believe in creating a user as a discrete operation
 case $os in
 Mac )
   # Apple don't seem to believe in creating a user as a discrete operation

-  if dscl / -read /Groups/$group >/dev/null 2>&1; then
+  if dscl . -read /Groups/$group >/dev/null 2>&1; then

     echo "$group group already exists"
   else
     echo "Creating $group group"
     echo "$group group already exists"
   else
     echo "Creating $group group"

-    gids=$(dscl / -list /Groups PrimaryGroupID|awk '{print $2}')
+    gids=$(dscl . -list /Groups PrimaryGroupID|awk '{print $2}')

     gid=$(pick $gids)
     echo "(picked gid $gid)"
     gid=$(pick $gids)
     echo "(picked gid $gid)"

-    dscl / -create /Groups/$group
-    dscl / -create /Groups/$group PrimaryGroupID $gid
-    dscl / -create /Groups/$group Password \*
+    dscl . -create /Groups/$group
+    dscl . -create /Groups/$group PrimaryGroupID $gid
+    dscl . -create /Groups/$group Password \*

   fi
   fi

-  if dscl / -read /Users/$user >/dev/null 2>&1; then
+  if dscl . -read /Users/$user >/dev/null 2>&1; then

     echo "$user user already exists"
   else
     echo "Creating $user user"
     echo "$user user already exists"
   else
     echo "Creating $user user"

-    uids=$(dscl / -list /Users UniqueID|awk '{print $2}')
+    uids=$(dscl . -list /Users UniqueID|awk '{print $2}')

     uid=$(pick $uids)
     echo "(picked uid $uid)"
     uid=$(pick $uids)
     echo "(picked uid $uid)"

-    gid=$(dscl / -read /Groups/$group PrimaryGroupID | awk '{print $2}')
-    dscl / -create /Users/$user
-    dscl / -create /Users/$user UniqueID $uid
-    dscl / -create /Users/$user UserShell /usr/bin/false
-    dscl / -create /Users/$user RealName 'DisOrder server'
-    dscl / -create /Users/$user NFSHomeDirectory pkgstatedir
-    dscl / -create /Users/$user PrimaryGroupID $gid
-    dscl / -create /Users/$user Password \*
+    gid=$(dscl . -read /Groups/$group PrimaryGroupID | awk '{print $2}')
+    dscl . -create /Users/$user
+    dscl . -create /Users/$user UniqueID $uid
+    dscl . -create /Users/$user UserShell /usr/bin/false
+    dscl . -create /Users/$user RealName 'DisOrder server'
+    dscl . -create /Users/$user NFSHomeDirectory pkgstatedir
+    dscl . -create /Users/$user PrimaryGroupID $gid
+    dscl . -create /Users/$user Password \*

   fi
   ;;
 FreeBSD )
   fi
   ;;
 FreeBSD )

diff --git a/scripts/teardown.in b/scripts/teardown.in
index 4ef1e4dac701210934f8e779b5213946f2844ea5..c88b153c5153dea775b397689e8af4d6218921a2 100755 (executable)
--- a/scripts/teardown.in
+++ b/scripts/teardown.in
@@ -51,8 +51,8 @@ Darwin )
   s rm -rf pkgstatedir
   s rm -rf pkgconfdir
   echo "* removing user and group"
   s rm -rf pkgstatedir
   s rm -rf pkgconfdir
   echo "* removing user and group"

-  s dscl / -delete /Users/jukebox || true
-  s dscl / -delete /Groups/jukebox || true
+  s dscl . -delete /Users/jukebox || true
+  s dscl . -delete /Groups/jukebox || true

   ;;
 Linux )
   echo "* stopping server"
   ;;
 Linux )
   echo "* stopping server"