From dea8b96ba7871e195c654273b5441e1180685a76 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Sat, 19 Nov 2016 21:58:01 +0000
Subject: [PATCH] No braces

---
 src/freedombone-app-etherpad | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/freedombone-app-etherpad b/src/freedombone-app-etherpad
index 9d93b5b2..ce5a6af8 100755
--- a/src/freedombone-app-etherpad
+++ b/src/freedombone-app-etherpad
@@ -59,14 +59,14 @@ function change_password_etherpad {
 
     read_config_param ETHERPAD_DOMAIN_NAME
 
-    ${PROJECT_NAME}-pass -u $change_username -a etherpad -p "$new_user_password"
-    if grep "\"\${change_username}\": {" /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json; then
-        user_line=$(cat /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json | grep "\"\${change_username}\": {")
+    if grep "\"$change_username\": {" /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json; then
+        user_line=$(cat /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json | grep "\"$change_username\": {")
         if [[ "$user_line" == *"\"is_admin\": true"* ]]; then
-            sed -i "s|\"\${change_username}\": {.*|\"\${change_username}\": { \"password\": \"\${new_user_password}\", \"is_admin\": true }" /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json
+            sed -i "s|\"$change_username\": {.*|\"$change_username\": { \"password\": \"$new_user_password\", \"is_admin\": true }" /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json
         else
-            sed -i "s|\"\${change_username}\": {.*|\"\${change_username}\": { \"password\": \"\${new_user_password}\", \"is_admin\": false }," /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json
+            sed -i "s|\"$change_username\": {.*|\"$change_username\": { \"password\": \"$new_user_password\", \"is_admin\": false }," /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json
         fi
+        ${PROJECT_NAME}-pass -u $change_username -a etherpad -p "$new_user_password"
     fi
 }