diff --git a/hdd/adduser.sh b/hdd/adduser.sh index 1edeef5a4aefccda826d62f4bb702d2666ea045d..173912754cd5a341594622e77f539c2976713d5d 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