From b2bc96f5e5ec6ce3efa8c1d2b40decc68cbbd94c Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Fri, 25 Sep 2015 22:54:23 +0100
Subject: [PATCH] Tidying restore script

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

diff --git a/src/freedombone b/src/freedombone
index ca584946..0b42323f 100755
--- a/src/freedombone
+++ b/src/freedombone
@@ -2907,7 +2907,6 @@ function restore_directory_from_usb {
 
 function restore_database {
   echo 'function restore_database {' >> /usr/bin/$RESTORE_SCRIPT_NAME
-  echo "  DATABASE_PASSWORD=\"$DATABASE_PASSWORD\"" >> /usr/bin/$RESTORE_SCRIPT_NAME
   if [[ $BACKUP_TYPE == 'obnam' ]]; then
       echo '  RESTORE_SUBDIR="root"' >> /usr/bin/$RESTORE_SCRIPT_NAME
   else
@@ -3028,6 +3027,11 @@ function create_restore_script {
   echo 'cp -r /home/$MY_USERNAME/.gnupg /root' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
 
+  echo '# MariaDB password' >> /usr/bin/$RESTORE_SCRIPT_NAME
+  echo -n 'DATABASE_PASSWORD=$(cat ' >> /usr/bin/$RESTORE_SCRIPT_NAME
+  echo "$DATABASE_PASSWORD_FILE)" >> /usr/bin/$RESTORE_SCRIPT_NAME
+  echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
+
   restore_directory_from_usb
   echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
   restore_database
@@ -3063,10 +3067,6 @@ function create_restore_script {
       echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
       echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
   fi
-  echo '# MariaDB password' >> /usr/bin/$RESTORE_SCRIPT_NAME
-  echo -n 'DATABASE_PASSWORD=$(cat ' >> /usr/bin/$RESTORE_SCRIPT_NAME
-  echo "$DATABASE_PASSWORD_FILE)" >> /usr/bin/$RESTORE_SCRIPT_NAME
-  echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
 
   echo '# Make a backup of the original README file' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '# incase old passwords need to be used' >> /usr/bin/$RESTORE_SCRIPT_NAME