From 5b6702c26cf65f35160674d5d8e315950e028b55 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sat, 19 Nov 2016 23:11:36 +0000 Subject: [PATCH] Return values --- src/freedombone-app-etherpad | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/freedombone-app-etherpad b/src/freedombone-app-etherpad index 1e8308b1..6cac10a6 100755 --- a/src/freedombone-app-etherpad +++ b/src/freedombone-app-etherpad @@ -203,12 +203,18 @@ function remove_user_etherpad { function add_user_etherpad { new_username="$1" new_user_password="$2" - ${PROJECT_NAME}-pass -u $new_username -a etherpad -p "$new_user_password" read_config_param ETHERPAD_DOMAIN_NAME if ! grep -q "\"$new_username\": {" /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json; then + ${PROJECT_NAME}-pass -u $new_username -a etherpad -p "$new_user_password" sed -i "/\"users\": {/a \"$new_username\": { \"password\": \"$new_user_password\", \"is_admin\": false }," /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json - systemctl restart etherpad + if grep -q "\"$new_username\": {" /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json; then + systemctl restart etherpad + else + echo '1' + return + fi fi + echo '0' } function install_interactive_etherpad {