From: mwolson_admin <mwolson_admin@deleuze.hcoop.net>
Date: Fri, 15 Feb 2008 00:51:08 +0000 (-0500)
Subject: destroy-user: Handle missing param, fix /old/ removal
X-Git-Url: http://git.hcoop.net/clinton/scripts.git/commitdiff_plain/1311d6b04e5eca6a9f629dc70b7f654035f8e4c6

destroy-user: Handle missing param, fix /old/ removal
---

diff --git a/destroy-user b/destroy-user
index 0568d32..23b6175 100755
--- a/destroy-user
+++ b/destroy-user
@@ -6,6 +6,10 @@
 #  - while holding system:administrator tokens
 
 USER=$1
+if test -z "$USER"; then
+	echo Usage: destroy-user USERNAME
+	exit 1
+fi
 
 PATHBITS=`echo $USER | head -c 1`/`echo $USER | head -c 2`/$USER
 HOMEPATH=/afs/hcoop.net/user/$PATHBITS
@@ -50,8 +54,8 @@ fs rm $MAILPATH
 fs rm $HOMEPATH
 #fs rm $LOGSPATH
 fs rm $DBPATH
-fs rm /afs/hcoop.net/old/user/$PATHBITS
-fs rm /afs/hcoop.net/old/mail/$PATHBITS
+fs rm /afs/.hcoop.net/old/user/$PATHBITS
+fs rm /afs/.hcoop.net/old/mail/$PATHBITS
 vos remove deleuze.hcoop.net /vicepa user.$USER
 vos remove deleuze.hcoop.net /vicepa mail.$USER
 vos remove deleuze.hcoop.net /vicepa db.$USER
@@ -81,3 +85,4 @@ fs checkvolumes
 # Remove user from all of our mailing lists
 echo $USER@hcoop.net | sudo -u list \
     /var/lib/mailman/bin/remove_members --fromall -f -
+