Finish off Mac support in scripts/setup.

[disorder] / scripts / teardown.in

diff --git a/scripts/teardown.in b/scripts/teardown.in
index dbf593cd6aa939b14590f830a04b8c891337d9b1..63df4eb166e60c8182c4a062a68791271d66e7ab 100755 (executable)
--- a/scripts/teardown.in
+++ b/scripts/teardown.in
@@ -32,8 +32,8 @@ FreeBSD )
   rm -rf pkgstatedir
   rm -rf pkgconfdir
   echo "* removing user and group"
   rm -rf pkgstatedir
   rm -rf pkgconfdir
   echo "* removing user and group"

-  pw groupdel jukebox || true

   pw userdel jukebox || true
   pw userdel jukebox || true

+  pw groupdel jukebox || true

   ;;
 Darwin )
   echo "* stopping server"
   ;;
 Darwin )
   echo "* stopping server"


@@ -45,6 +45,9 @@ Darwin )
   rm -f /Library/LaunchDaemons/uk.org.greenend.rjk.disorder.plist
   rm -rf pkgstatedir
   rm -rf pkgconfdir
   rm -f /Library/LaunchDaemons/uk.org.greenend.rjk.disorder.plist
   rm -rf pkgstatedir
   rm -rf pkgconfdir

+  echo "* removing user and group"
+  dscl / -delete /Users/jukebox || true
+  dscl / -delete /Groups/jukebox || true

   ;;  
 * )
   echo Unknown operating system >&2
   ;;  
 * )
   echo Unknown operating system >&2