Bob Mottram před 8 roky
rodič
revize
1b3691742e
1 změnil soubory, kde provedl 4 přidání a 4 odebrání
  1. 4
    4
      src/freedombone-app-etherpad

+ 4
- 4
src/freedombone-app-etherpad Zobrazit soubor

@@ -60,12 +60,12 @@ function change_password_etherpad {
60 60
     read_config_param ETHERPAD_DOMAIN_NAME
61 61
 
62 62
     ${PROJECT_NAME}-pass -u $change_username -a etherpad -p "$new_user_password"
63
-    if grep "\"${change_username}\": {" /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json; then
64
-        user_line=$(cat /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json | grep "\"${change_username}\": {")
63
+    if grep "\"\${change_username}\": {" /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json; then
64
+        user_line=$(cat /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json | grep "\"\${change_username}\": {")
65 65
         if [[ "$user_line" == *"\"is_admin\": true"* ]]; then
66
-            sed -i "s|\"${change_username}\": {.*|\"${change_username}\": { \"password\": \"${new_user_password}\", \"is_admin\": true }," /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json
66
+            sed -i "s|\"\${change_username}\": {.*|\"\${change_username}\": { \"password\": \"\${new_user_password}\", \"is_admin\": true }" /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json
67 67
         else
68
-            sed -i "s|\"${change_username}\": {.*|\"${change_username}\": { \"password\": \"${new_user_password}\", \"is_admin\": false }" /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json
68
+            sed -i "s|\"\${change_username}\": {.*|\"\${change_username}\": { \"password\": \"\${new_user_password}\", \"is_admin\": false }," /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json
69 69
         fi
70 70
     fi
71 71
 }