From 7c0998f7fa221d148b1d1dbbb44b62d97715f956 Mon Sep 17 00:00:00 2001 From: Casper Date: Sun, 19 Jul 2020 21:21:01 +0200 Subject: [PATCH 1/3] Check if second argument is given --- target/bin/addalias | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/target/bin/addalias b/target/bin/addalias index e426e974..bec227b5 100755 --- a/target/bin/addalias +++ b/target/bin/addalias @@ -18,7 +18,8 @@ escape() { 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 && errex "Alias \"$EMAIL $RECIPIENT\" already exists" From 11ab4a84a90ec4a4a413c21f99b08ad14b23cf5b Mon Sep 17 00:00:00 2001 From: Casper Date: Sun, 19 Jul 2020 21:23:59 +0200 Subject: [PATCH 2/3] More detailed error message --- target/bin/delalias | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/target/bin/delalias b/target/bin/delalias index c97a1c39..07faed9a 100755 --- a/target/bin/delalias +++ b/target/bin/delalias @@ -18,7 +18,9 @@ escape() { 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 #CNT=$(grep "^$EMAIL" $DATABASE | wc -w | awk '{print $1}') From 2ffb0de1db412331a3a31fd7a18e79dd47e94725 Mon Sep 17 00:00:00 2001 From: Casper Date: Sun, 19 Jul 2020 21:33:06 +0200 Subject: [PATCH 3/3] Small change to error message --- target/bin/listalias | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/bin/listalias b/target/bin/listalias index 8e655bbe..f6848ec5 100755 --- a/target/bin/listalias +++ b/target/bin/listalias @@ -7,7 +7,7 @@ errex() { exit 1 } -[ -f $DATABASE ] || errex "No postfix-virtual.cf file" -[ -s $DATABASE ] || errex "Empty postfix-virtual.cf - no aliases have been added" +[ -f $DATABASE ] || errex "Error: No postfix-virtual.cf file" +[ -s $DATABASE ] || errex "Error: Empty postfix-virtual.cf - no aliases have been added" (grep -v "^\s*$\|^\s*\#" $DATABASE || true)