浏览代码

No braces

Bob Mottram 8 年前
父节点
当前提交
a9f1db727d
共有 1 个文件被更改,包括 6 次插入4 次删除
  1. 6
    4
      src/freedombone-app-etherpad

+ 6
- 4
src/freedombone-app-etherpad 查看文件

188
 
188
 
189
 function remove_user_etherpad {
189
 function remove_user_etherpad {
190
     remove_username="$1"
190
     remove_username="$1"
191
+
191
     read_config_param ETHERPAD_DOMAIN_NAME
192
     read_config_param ETHERPAD_DOMAIN_NAME
193
+
192
     ${PROJECT_NAME}-pass -u $remove_username --rmapp etherpad
194
     ${PROJECT_NAME}-pass -u $remove_username --rmapp etherpad
193
 
195
 
194
-    if ! grep -q "\"${remove_username}\": {" /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json; then
195
-        sed -i "/\"${remove_username}\": {/,/},/d" /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json
196
+    if ! grep -q "\"$remove_username\": {" /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json; then
197
+        sed -i "/\"$remove_username\": {/,/},/d" /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json
196
     fi
198
     fi
197
 }
199
 }
198
 
200
 
201
     new_user_password="$2"
203
     new_user_password="$2"
202
     ${PROJECT_NAME}-pass -u $new_username -a etherpad -p "$new_user_password"
204
     ${PROJECT_NAME}-pass -u $new_username -a etherpad -p "$new_user_password"
203
     read_config_param ETHERPAD_DOMAIN_NAME
205
     read_config_param ETHERPAD_DOMAIN_NAME
204
-    if ! grep -q "\"${new_username}\": {" /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json; then
205
-        sed -i "/\"users\": {/a    \"${new_username}\": { \"password\": \"${new_user_password}\", \"is_admin\": false }," /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json
206
+    if ! grep -q "\"$new_username\": {" /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json; then
207
+        sed -i "/\"users\": {/a    \"$new_username\": { \"password\": \"$new_user_password\", \"is_admin\": false }," /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json
206
     fi
208
     fi
207
 }
209
 }
208
 
210