try new function

This commit is contained in:
2015-07-10 16:07:34 +03:00
parent 4f183e9c44
commit e1aea2fa95

View File

@@ -140,6 +140,7 @@ $ATTACHMENT
} }
function notesdelete { # $1=$USER function notesdelete { # $1=$USER
USER="$1"
# 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
@@ -148,6 +149,14 @@ function notesdelete { # $1=$USER
rm $NOTESTMP rm $NOTESTMP
} }
function notesinsert {
# Update datasheet (add new entry in Email section)
USER=$1
PASS=$2
sed -i "/$TAIL/i User: $USER\nPass: $PASS\n" $NOTES
}
## FIRST CHECKS ## FIRST CHECKS
if ! $(checkaction "$ACTION"); then if ! $(checkaction "$ACTION"); then
echo "No valid action chosen" echo "No valid action chosen"
@@ -222,18 +231,9 @@ if [ "$ACTION" == "changepw" ]; then
LEAD='## > EMAIL' LEAD='## > EMAIL'
TAIL='## < 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" notesdelete "$USER"
# Update datasheet (add new entry in Email section) notesinsert "$USER" "$PASS"
TAIL='## < EMAIL'
sed -i "/$TAIL/i User: $USER\nPass: $PASS\n" $NOTES
fi fi
fi # /changepw fi # /changepw