Bob Mottram 7 лет назад
Родитель
Сommit
0e36a43ae0
1 измененных файлов: 5 добавлений и 3 удалений
  1. 5
    3
      src/freedombone-app-matrix

+ 5
- 3
src/freedombone-app-matrix Просмотреть файл

@@ -315,6 +315,9 @@ function add_user_matrix {
315 315
     is_admin_user='-a'
316 316
 
317 317
     read_config_param MY_USERNAME
318
+    read_config_param ONION_ONLY
319
+    read_config_param MATRIX_DOMAIN_NAME
320
+
318 321
     if [[ "$new_username" != "$MY_USERNAME" ]]; then
319 322
         is_admin_user=''
320 323
     fi
@@ -322,10 +325,9 @@ function add_user_matrix {
322 325
     ${PROJECT_NAME}-pass -u $new_username -a matrix -p "$new_user_password"
323 326
 
324 327
     if [[ $ONION_ONLY == 'no' ]]; then
325
-        read_config_param MATRIX_DOMAIN_NAME
326
-        retval=$(register_new_matrix_user -c ${MATRIX_DATA_DIR}/homeserver.yaml -u "${new_username}" -p "${new_user_password}" $is_admin_user https://${MATRIX_DOMAIN_NAME})
328
+        register_new_matrix_user -c ${MATRIX_DATA_DIR}/homeserver.yaml -u "${new_username}" -p "${new_user_password}" $is_admin_user https://${MATRIX_DOMAIN_NAME}
327 329
     else
328
-        retval=$(register_new_matrix_user -c ${MATRIX_DATA_DIR}/homeserver.yaml -u "${new_username}" -p "${new_user_password}" $is_admin_user http://${MATRIX_DOMAIN_NAME})
330
+        register_new_matrix_user -c ${MATRIX_DATA_DIR}/homeserver.yaml -u "${new_username}" -p "${new_user_password}" $is_admin_user http://${MATRIX_DOMAIN_NAME}
329 331
     fi
330 332
     echo "0"
331 333
 }