Archive-Team
/
docker-mailserver
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1573 from casperklein/patch-2 

addalias: check if two arguments are given
This commit is contained in:
Erik Wramner 2020-07-22 16:13:51 +02:00 committed by GitHub
parent cc34be2684 398b1dd554
commit 26cc0c49ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
target/bin/addalias
View File

@ -18,7 +18,8 @@ escape() {
echo "${1//./\\.}" echo "${1//./\\.}"
} }
[ -z "$EMAIL" ] && { usage; errex "no email specified"; } [ -z "$EMAIL" ] && { usage; errex "Error: No alias specified"; }
[ -z "$RECIPIENT" ] && { usage; errex "Error: No recipient specified"; }
grep -qi "^$(escape $EMAIL)[a-zA-Z@.\ ]*$(escape $RECIPIENT)" $DATABASE 2>/dev/null && grep -qi "^$(escape $EMAIL)[a-zA-Z@.\ ]*$(escape $RECIPIENT)" $DATABASE 2>/dev/null &&
errex "Alias \"$EMAIL $RECIPIENT\" already exists" errex "Alias \"$EMAIL $RECIPIENT\" already exists"

4
target/bin/delalias
View File

@ -18,7 +18,9 @@ escape() {
echo "${1//./\\.}" echo "${1//./\\.}"
} }
[ -z "$EMAIL" ] || [ -z "$RECIPIENT" ] && { usage; errex "No email specifed"; } [ -z "$EMAIL" ] && { usage; errex "Error: No alias specified"; }
[ -z "$RECIPIENT" ] && { usage; errex "Error: No recipient specified"; }
[ -s "$DATABASE" ] || exit 0 [ -s "$DATABASE" ] || exit 0
#CNT=$(grep "^$EMAIL" $DATABASE | wc -w | awk '{print $1}') #CNT=$(grep "^$EMAIL" $DATABASE | wc -w | awk '{print $1}')

4
target/bin/listalias
View File

@ -7,7 +7,7 @@ errex() {
exit 1 exit 1
} }
[ -f $DATABASE ] || errex "No postfix-virtual.cf file" [ -f $DATABASE ] || errex "Error: No postfix-virtual.cf file"
[ -s $DATABASE ] || errex "Empty postfix-virtual.cf - no aliases have been added" [ -s $DATABASE ] || errex "Error: Empty postfix-virtual.cf - no aliases have been added"
(grep -v "^\s*$\|^\s*\#" $DATABASE || true) (grep -v "^\s*$\|^\s*\#" $DATABASE || true)