From 69ee54513ecfc5e10cb120b9e95e281fdca31b3f Mon Sep 17 00:00:00 2001 From: Josef Friedrich Date: Mon, 29 Aug 2016 07:13:36 +0200 Subject: [PATCH] Fix build (#286) The Refactoring of the scripts 'addmailuser' and 'delmailuser' destroyed the build process. --- target/bin/addmailuser | 7 ++++--- target/bin/delmailuser | 5 +---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/target/bin/addmailuser b/target/bin/addmailuser index c0256b05..f6a29ec6 100755 --- a/target/bin/addmailuser +++ b/target/bin/addmailuser @@ -17,12 +17,13 @@ if [ ! -z "$1" ]; then PASS="$2" else read -s -p "Enter Password: " PASS - if [ -z "$PASS" ]; then + if [ -z "$PASS" ]; then echo "Password can't be empty" exit 1 fi - ENTRY=$(echo "$USER|$(doveadm pw -s SHA512-CRYPT -u "$USER" -p "$PASS")") - echo "$ENTRY" >> $DATABASE + fi + ENTRY=$(echo "$USER|$(doveadm pw -s SHA512-CRYPT -u "$USER" -p "$PASS")") + echo "$ENTRY" >> $DATABASE else usage fi diff --git a/target/bin/delmailuser b/target/bin/delmailuser index b3160ece..9638b026 100755 --- a/target/bin/delmailuser +++ b/target/bin/delmailuser @@ -4,13 +4,10 @@ DATABASE=/tmp/docker-mailserver/postfix-accounts.cf function usage { echo "Usage: delmailuser " - exit 1 + exit 1 } if [ ! -z "$1" ]; then - USER=$1 - ENTRIES=$(grep "$USER" -vi $DATABASE) - echo "$ENTRIES" > $DATABASE USER=$1 if [ -f "$DATABASE" ]; then ENTRIES=$(grep "$USER" -vi $DATABASE)