creategroup

@@ -13,7 +13,7 @@ fi
 cn="$1"
 
 if group_exists $cn; then
-    echo "Group $cn already exist." 
+    echo "Group $cn already exists." 
     exit 1
 fi
 

createperson

@@ -31,7 +31,7 @@ done
 pw=$(/usr/sbin/slappasswd -s "salut$uid")
 
 if user_exists $uid; then
-    echo "User $uid already exist." 
+    echo "User $uid already exists." 
     exit 1
 fi
 

removeperson

@@ -2,6 +2,12 @@
 . .env
 . funcs
 
+# Check if option -y is passed
+if [ "$1" = "-y" ]; then
+	confirmed="true"
+	shift
+fi
+
 uid=$1
 if user_exists $uid; then
     true
@@ -10,15 +16,19 @@ else
     exit 1
 fi
 
-read -p "Are you sure you want to delete user $uid [y/N] " a
+[ -z "$confirmed" ] && read -p "Are you sure you want to delete user $uid [y/N] " a
 
 case $a in
     y*|o* )
+	confirmed="true";;
+    *)
+	confirmed="false";;
+esac
+
+if [ $confirmed = "true" ]; then
 	if user_is_posix $uid; then 
 		ldapdelete $LDAPOPTS cn=$uid,$GROUPSDN
 		./removefromgroups $uid $(get_posixGroups $uid)
 	fi
-	ldapdelete $LDAPOPTS uid=$uid,$PEOPLEDN ;;
-    * )
-        exit;;
-esac
+	ldapdelete $LDAPOPTS uid=$uid,$PEOPLEDN
+fi