try new function
This commit is contained in:
20
action.sh
20
action.sh
@@ -140,6 +140,7 @@ $ATTACHMENT
|
||||
}
|
||||
|
||||
function notesdelete { # $1=$USER
|
||||
USER="$1"
|
||||
# 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
|
||||
@@ -148,6 +149,14 @@ function notesdelete { # $1=$USER
|
||||
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
|
||||
if ! $(checkaction "$ACTION"); then
|
||||
echo "No valid action chosen"
|
||||
@@ -222,18 +231,9 @@ if [ "$ACTION" == "changepw" ]; 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"
|
||||
|
||||
# Update datasheet (add new entry in Email section)
|
||||
TAIL='## < EMAIL'
|
||||
sed -i "/$TAIL/i User: $USER\nPass: $PASS\n" $NOTES
|
||||
notesinsert "$USER" "$PASS"
|
||||
|
||||
fi
|
||||
fi # /changepw
|
||||
|
||||
Reference in New Issue
Block a user