From 070829b8d0825818737adcc16152e18f019748f2 Mon Sep 17 00:00:00 2001 From: mxmehl Date: Fri, 10 Jul 2015 09:44:03 +0300 Subject: [PATCH] adding functionality to delete user:pass from datasheet when deleting an user --- action.sh | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/action.sh b/action.sh index 7b14075..ac792d5 100755 --- a/action.sh +++ b/action.sh @@ -133,8 +133,8 @@ if [ "$ACTION" == "adduser" ]; then if [ $? == 0 ]; then # Send infomail mailsend "New Email account created" \ - "A new Email account has been created." \ - "User: $USER | Password: $PASS" + "A new Email account has been created." \ + "User: $USER | Password: $PASS" # Update datasheet (add new entry in Email section) TAIL='## < EMAIL' @@ -162,10 +162,26 @@ if [ "$ACTION" == "changepw" ]; then python changepw.py "$USER" "$PASS" - mailsend "Email password changed" \ - "An Email account password has been changed." \ - "User: $USER | New Password: $PASS" - + if [ $? == 0 ]; then + # Send infomail + mailsend "Email password changed" \ + "An Email account password has been changed." \ + "User: $USER | New Password: $PASS" + + # Update datasheet (delete entry in Email section) + LEAD='## > EMAIL' + TAIL='## < EMAIL' + + # Extract Mail part | exclude LEAD and TAIL | delete user + sed -n "/$LEAD/,/$TAIL/ p" $NOTES | grep -v "$LEAD\|$TAIL" | sed "/User:[ \t]*$USER$/,+2d" > $NOTESTMP + + # Put edited part in between $LEAD and $TAIL again + sed -i "/$LEAD/,/$TAIL/{ /$LEAD/{p; r $NOTESTMP + }; /$TAIL/p; d }" $NOTES + + rm $NOTESTMP + + fi fi # /changepw # # # # #