From 5ba9d6e869c6df0fc391033953b39b626d408c04 Mon Sep 17 00:00:00 2001
From: Thiago Abdo <tja14@inf.ufpr.br>
Date: Tue, 19 Jan 2016 11:44:14 -0200
Subject: [PATCH] [add user] add some output
Signed-off-by: Thiago Abdo <tja14@inf.ufpr.br>
---
hdd/adduser.sh | 29 +++++++++++++++--------------
1 file changed, 15 insertions(+), 14 deletions(-)
diff --git a/hdd/adduser.sh b/hdd/adduser.sh
index 1edeef5..1739127 100755
--- a/hdd/adduser.sh
+++ b/hdd/adduser.sh
@@ -98,6 +98,7 @@ remove_group(){
#get user that is direct from this group
local username=$( echo $group | cut -d':' -f1);
local userDetail=$( cat /etc/passwd | cut -d':' -f1-3 | grep -e "^$username:")
+ echo $0": Removendo usuário "$username" do group"
#remove user that is from this group
remove_user "$userDetail"
@@ -207,28 +208,28 @@ if [ -n "$checkNotLocalGroupName" ]; then
exit 22
fi
-checkName=$( cat /etc/passwd | cut -d':' -f1-3 | grep -e "^$username:" )
-if [ -n "$checkName" ]; then
- remove_user "$checkName"
- echo $0": encontrei outro usuario local com o mesmo nome, devo remove-lo"
-fi
-
-checkID=$( cat /etc/passwd | cut -d':' -f1-3 | grep -e ":$uID$" )
-if [ -n "$checkID" ]; then
- remove_user "$checkID"
- echo $0": encontrei outro usuario local com o mesmo id, devo remove-lo"
-fi
-
checkGID=$( cat /etc/group | grep -e ":$gID:" )
if [ -n "$checkGID" ]; then
- remove_group "$checkGID"
echo $0": encontrei outro usuario local com o mesmo id de grupo, devo remove-lo"
+ remove_group "$checkGID"
fi
checkGName=$( cat /etc/group | grep -e "^$groupname:" )
if [ -n "$checkGName" ]; then
- remove_group "$checkGName"
echo $0": encontrei outro usuario local com o mesmo nome de grupo, devo remove-lo"
+ remove_group "$checkGName"
+fi
+
+checkName=$( cat /etc/passwd | cut -d':' -f1-3 | grep -e "^$username:" )
+if [ -n "$checkName" ]; then
+ echo $0": encontrei outro usuario local com o mesmo nome, devo remove-lo"
+ remove_user "$checkName"
+fi
+
+checkID=$( cat /etc/passwd | cut -d':' -f1-3 | grep -e ":$uID$" )
+if [ -n "$checkID" ]; then
+ echo $0": encontrei outro usuario local com o mesmo id, devo remove-lo"
+ remove_user "$checkID"
fi
#add local user
--
GitLab