try new function

This commit is contained in:
2015-07-10 16:03:36 +03:00
parent 97986f4627
commit 4f183e9c44

View File

@@ -139,6 +139,15 @@ $ATTACHMENT
rm $MAILTMP; rm $MAILTMP;
} }
function notesdelete { # $1=$USER
# 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
}
## FIRST CHECKS ## FIRST CHECKS
if ! $(checkaction "$ACTION"); then if ! $(checkaction "$ACTION"); then
echo "No valid action chosen" echo "No valid action chosen"
@@ -213,12 +222,15 @@ if [ "$ACTION" == "changepw" ]; then
LEAD='## > EMAIL' LEAD='## > EMAIL'
TAIL='## < EMAIL' TAIL='## < EMAIL'
# Extract Mail part | exclude LEAD and TAIL | delete user ## 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 #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 ## Put edited part in between $LEAD and $TAIL again
sed -i "/$LEAD/,/$TAIL/{ /$LEAD/{p; r $NOTESTMP #sed -i "/$LEAD/,/$TAIL/{ /$LEAD/{p; r $NOTESTMP
}; /$TAIL/p; d }" $NOTES #}; /$TAIL/p; d }" $NOTES
rm $NOTESTMP #rm $NOTESTMP
notesdelete "$USER"
# Update datasheet (add new entry in Email section) # Update datasheet (add new entry in Email section)
TAIL='## < EMAIL' TAIL='## < EMAIL'
sed -i "/$TAIL/i User: $USER\nPass: $PASS\n" $NOTES sed -i "/$TAIL/i User: $USER\nPass: $PASS\n" $NOTES