From 9ea93a82880826f878095b43a18cbdde8edcc0ea Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 19 Aug 2018 14:24:45 +0100
Subject: [PATCH] Adding users should have return value
---
src/freedombone-adduser | 7 ++++---
src/freedombone-app-mailpile | 2 ++
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/freedombone-adduser b/src/freedombone-adduser
index efe204f58..cd1f5f926 100755
--- a/src/freedombone-adduser
+++ b/src/freedombone-adduser
@@ -229,9 +229,10 @@ do
if [[ $(function_exists "add_user_${app_name}") == "1" ]]; then
echo $"Adding user to ${app_name}"
app_load_variables "${app_name}"
- retval=$("add_user_${app_name}" "$ADD_USERNAME" "$NEW_USER_PASSWORD" | tail -n 1)
- if [[ $retval != '0' ]]; then
- echo $"Failed with error code ${retval}"
+ retval=$("add_user_${app_name}" "$ADD_USERNAME" "$NEW_USER_PASSWORD")
+ retval_last_value=$(echo "$retval" | tail -n 1)
+ if [[ $retval_last_value != '0' ]]; then
+ echo $"Failed with error code ${retval_last_value}"
"${PROJECT_NAME}-rmuser" "$ADD_USERNAME" --force
exit 672392
fi
diff --git a/src/freedombone-app-mailpile b/src/freedombone-app-mailpile
index 13d1b7577..22a57f4d2 100755
--- a/src/freedombone-app-mailpile
+++ b/src/freedombone-app-mailpile
@@ -61,10 +61,12 @@ function logging_off_mailpile {
function remove_user_mailpile {
remove_username="$1"
"${PROJECT_NAME}-pass" -u "$remove_username" --rmapp mailpile
+ echo "0"
}
function add_user_mailpile {
"${PROJECT_NAME}-pass" -u "$1" -a mailpile -p "$2"
+ echo "0"
}
function install_interactive_mailpile {
--
GitLab