X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/244348f83c4e8695ba6aa7cdc6b9a39377754761..031f8feb8a0ce8c536e5121f51634ec0565ed403:/scripts/teardown.in

diff --git a/scripts/teardown.in b/scripts/teardown.in
index dbf593c..4ef1e4d 100755
--- a/scripts/teardown.in
+++ b/scripts/teardown.in
@@ -20,32 +20,54 @@
 #
 set -e
 
+s() {
+  echo ">" "$@"
+  "$@"
+}
+
 case $(uname -s) in
 FreeBSD )
   APACHE=apache22
   echo "* killing disorderd processes"
-  killall disorderd || true
+  s killall disorderd || true
   echo "* removing files"
-  rm -f /usr/local/www/$APACHE/cgi-bin/disorder
-  rm -f /usr/local/www/$APACHE/data/disorder
-  rm -f /etc/rc.d/disorder
-  rm -rf pkgstatedir
-  rm -rf pkgconfdir
+  s rm -f /usr/local/www/$APACHE/cgi-bin/disorder
+  s rm -f /usr/local/www/$APACHE/data/disorder
+  s rm -f /etc/rc.d/disorder
+  s rm -rf pkgstatedir
+  s rm -rf pkgconfdir
   echo "* removing user and group"
-  pw groupdel jukebox || true
-  pw userdel jukebox || true
+  s pw userdel jukebox || true
+  s pw groupdel jukebox || true
   ;;
 Darwin )
   echo "* stopping server"
-  launchctl stop uk.org.greenend.rjk.disorder || true
-  launchctl unload /Library/LaunchDaemons/uk.org.greenend.rjk.disorder.plist || true
+  s launchctl stop uk.org.greenend.rjk.disorder || true
+  s launchctl unload /Library/LaunchDaemons/uk.org.greenend.rjk.disorder.plist || true
   echo "* removing files"
-  rm -f /Library/WebServer/CGI-Executables/disorder
-  rm -f /Library/WebServer/Documents/disorder
-  rm -f /Library/LaunchDaemons/uk.org.greenend.rjk.disorder.plist
-  rm -rf pkgstatedir
-  rm -rf pkgconfdir
-  ;;  
+  s rm -f /Library/WebServer/CGI-Executables/disorder
+  s rm -f /Library/WebServer/Documents/disorder
+  s rm -f /Library/LaunchDaemons/uk.org.greenend.rjk.disorder.plist
+  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
+  ;;
+Linux )
+  echo "* stopping server"
+  s killall disorderd || true
+  echo "* removing files"
+  s rm -f /usr/lib/cgi-bin/disorder /var/www/cgi-bin/disorder
+  s rm -f /var/www/disorder /var/www/html/disorder
+  s rm -f /etc/init.d/disorder /etc/rc.d/init.d/disorder
+  s rm -f /etc/rc*.d/*disorder /etc/rc.d/rc*.d/disorder
+  s rm -rf pkgstatedir
+  s rm -rf pkgconfdir
+  echo "* removing user and group"
+  s userdel jukebox || true
+  s groupdel jukebox || true
+  ;;
 * )
   echo Unknown operating system >&2
   exit 1