From: Richard Kettlewell <rjk@greenend.org.uk>
Date: Sat, 29 Mar 2008 15:24:01 +0000 (+0000)
Subject: Play catchup with Apple dscl's API churn
X-Git-Tag: 5.0.3~142
X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/commitdiff_plain/d7b0c55c571bf794cd00c84e9512358abcca4ede?ds=sidebyside;hp=1971d159f07ef404d892710d5683e209a805f457

Play catchup with Apple dscl's API churn
---

diff --git a/scripts/setup.in b/scripts/setup.in
index bf47f24..dc8ca9b 100755
--- 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
-  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"
-    gids=$(dscl / -list /Groups PrimaryGroupID|awk '{print $2}')
+    gids=$(dscl . -list /Groups PrimaryGroupID|awk '{print $2}')
     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
-  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"
-    uids=$(dscl / -list /Users UniqueID|awk '{print $2}')
+    uids=$(dscl . -list /Users UniqueID|awk '{print $2}')
     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 )
diff --git a/scripts/teardown.in b/scripts/teardown.in
index 4ef1e4d..c88b153 100755
--- 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 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"