Browse Source

No braces

Bob Mottram 8 years ago
parent
commit
dea8b96ba7
1 changed files with 5 additions and 5 deletions
  1. 5
    5
      src/freedombone-app-etherpad

+ 5
- 5
src/freedombone-app-etherpad View File

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