Bob Mottram 8 лет назад
Родитель
Сommit
a9f1db727d
1 измененных файлов: 6 добавлений и 4 удалений
  1. 6
    4
      src/freedombone-app-etherpad

+ 6
- 4
src/freedombone-app-etherpad Просмотреть файл

@@ -188,11 +188,13 @@ function create_etherpad_settings {
188 188
 
189 189
 function remove_user_etherpad {
190 190
     remove_username="$1"
191
+
191 192
     read_config_param ETHERPAD_DOMAIN_NAME
193
+
192 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 198
     fi
197 199
 }
198 200
 
@@ -201,8 +203,8 @@ function add_user_etherpad {
201 203
     new_user_password="$2"
202 204
     ${PROJECT_NAME}-pass -u $new_username -a etherpad -p "$new_user_password"
203 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 208
     fi
207 209
 }
208 210