瀏覽代碼

Return values

Bob Mottram 8 年之前
父節點
當前提交
5b6702c26c
共有 1 個文件被更改,包括 8 次插入2 次删除
  1. 8
    2
      src/freedombone-app-etherpad

+ 8
- 2
src/freedombone-app-etherpad 查看文件

203
 function add_user_etherpad {
203
 function add_user_etherpad {
204
     new_username="$1"
204
     new_username="$1"
205
     new_user_password="$2"
205
     new_user_password="$2"
206
-    ${PROJECT_NAME}-pass -u $new_username -a etherpad -p "$new_user_password"
207
     read_config_param ETHERPAD_DOMAIN_NAME
206
     read_config_param ETHERPAD_DOMAIN_NAME
208
     if ! grep -q "\"$new_username\": {" /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json; then
207
     if ! grep -q "\"$new_username\": {" /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json; then
208
+        ${PROJECT_NAME}-pass -u $new_username -a etherpad -p "$new_user_password"
209
         sed -i "/\"users\": {/a    \"$new_username\": { \"password\": \"$new_user_password\", \"is_admin\": false }," /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json
209
         sed -i "/\"users\": {/a    \"$new_username\": { \"password\": \"$new_user_password\", \"is_admin\": false }," /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json
210
-        systemctl restart etherpad
210
+        if grep -q "\"$new_username\": {" /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json; then
211
+            systemctl restart etherpad
212
+        else
213
+            echo '1'
214
+            return
215
+        fi
211
     fi
216
     fi
217
+    echo '0'
212
 }
218
 }
213
 
219
 
214
 function install_interactive_etherpad {
220
 function install_interactive_etherpad {