From d94b06829e6a55bd69cb32bf29d90470f5083306 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob.mottram@codethink.co.uk>
Date: Wed, 3 Feb 2016 16:17:45 +0000
Subject: [PATCH] Old and new format for admin password in readme

---
 src/freedombone | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/freedombone b/src/freedombone
index 4c13650f..f4aa5367 100755
--- a/src/freedombone
+++ b/src/freedombone
@@ -3272,6 +3272,9 @@ function get_mariadb_gnusocial_admin_password {
         if grep -q "MariaDB gnusocial admin password" /home/$MY_USERNAME/README; then
             MICROBLOG_ADMIN_PASSWORD=$(cat /home/$MY_USERNAME/README | grep "MariaDB gnusocial admin password" | awk -F ':' '{print $2}' | sed 's/^ *//')
         fi
+        if grep -q "Microblog administrator password" /home/$MY_USERNAME/README; then
+            MICROBLOG_ADMIN_PASSWORD=$(cat /home/$MY_USERNAME/README | grep "Microblog administrator password" | awk -F ':' '{print $2}' | sed 's/^ *//')
+        fi
     fi
 }
 
@@ -8526,7 +8529,7 @@ function install_gnu_social {
     # Create the configuration
     gnu_social_installer=/var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/scripts/install_cli.php
     ${gnu_social_installer} --server "${MICROBLOG_DOMAIN_NAME}" \
-	                        --host="localhost" --database="gnusocial" \
+                            --host="localhost" --database="gnusocial" \
                             --dbtype=mysql --username="root" -v \
                             --password="$MARIADB_PASSWORD" \
                             --sitename="My Social Network" --fancy='yes' \