1 files changed, 17 insertions, 8 deletions

diff --git a/net/cvsup-mirror/pkg-deinstall b/net/cvsup-mirror/pkg-deinstall
index 44d0200eb9e1..7e79cc31460c 100644
--- a/net/cvsup-mirror/pkg-deinstall
+++ b/net/cvsup-mirror/pkg-deinstall
@@ -29,6 +29,21 @@ yesno() {
     done
 }
 
+delete_account() {
+    local u g
+
+    u=$1
+    g=$2
+    if yesno "Do you want me to remove group \"${g}\"" y; then
+	pw groupdel -n ${g}
+	echo "Done."
+    fi
+    if yesno "Do you want me to remove user \"${u}\"" y; then
+	pw userdel -n ${u}
+	echo "Done."
+    fi
+}
+
 if [ x$2 != xDEINSTALL ]; then
     exit
 fi
@@ -80,11 +95,5 @@ if yesno "Do you want me to remove the cvsupd log entry from \
     echo "Done."
 fi
 
-if yesno "Do you want me to remove group \"${group}\"" y; then
-    pw groupdel -n ${group}
-    echo "Done."
-fi
-if yesno "Do you want me to remove user \"${user}\"" y; then
-    pw userdel -n ${user}
-    echo "Done."
-fi
+delete_account ${user} ${group}
+delete_account ${cuser} ${cgroup}