From 455a226649bfeee61b098bc46f0817d046796dae Mon Sep 17 00:00:00 2001 From: mxmehl Date: Fri, 10 Jul 2015 16:10:03 +0300 Subject: [PATCH] try new function --- action.sh | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/action.sh b/action.sh index 11fb56a..c275a1a 100755 --- a/action.sh +++ b/action.sh @@ -194,9 +194,9 @@ if [ "$ACTION" == "adduser" ]; then "A new Email account has been created." \ "User: $USER | Password: $PASS" - # Update datasheet (add new entry in Email section) + LEAD='## > EMAIL' TAIL='## < EMAIL' - sed -i "/$TAIL/i User: $USER\nPass: $PASS\n" $NOTES + notesinsert "$USER" "$PASS" fi fi # /adduser @@ -232,7 +232,6 @@ if [ "$ACTION" == "changepw" ]; then TAIL='## < EMAIL' notesdelete "$USER" - notesinsert "$USER" "$PASS" fi @@ -323,14 +322,7 @@ if [ "$ACTION" == "deluser" ]; then 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 + notesdelete "$USER" fi fi # /deluser