From eccf297ad2c1ccd5acbe7e763fd026e848c3337a Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Sun, 25 Oct 2015 20:24:13 +0000
Subject: [PATCH] More formatting

---
 src/freedombone | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/freedombone b/src/freedombone
index bbdb1ccd..2ac264b8 100755
--- a/src/freedombone
+++ b/src/freedombone
@@ -3182,7 +3182,7 @@ function create_restore_script {
   fi
   echo 'if [ -d $USB_MOUNT/backup/mutt ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '  for d in /home/*/ ; do' >> /usr/bin/$RESTORE_SCRIPT_NAME
-  echo '    USERNAME=$(echo "$d" | awk -F ''/'' ''{print $3}'')' >> /usr/bin/$RESTORE_SCRIPT_NAME
+  echo '    USERNAME=$(echo "$d" | awk -F '"'"'/'"'"' '"'"'{print $3}'"'"')' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '    if [[ $USERNAME != "git" ]]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '      echo "Restoring Mutt settings for $USERNAME"' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '      restore_directory_from_usb /root/tempmutt mutt/$USERNAME' >> /usr/bin/$RESTORE_SCRIPT_NAME
@@ -3214,7 +3214,7 @@ function create_restore_script {
   fi
   echo 'if [ -d $USB_MOUNT/backup/gnupg ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '  for d in /home/*/ ; do' >> /usr/bin/$RESTORE_SCRIPT_NAME
-  echo '    USERNAME=$(echo "$d" | awk -F ''/'' ''{print $3}'')' >> /usr/bin/$RESTORE_SCRIPT_NAME
+  echo '    USERNAME=$(echo "$d" | awk -F '"'"'/'"'"' '"'"'{print $3}'"'"')' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '    if [[ $USERNAME != "git" ]]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '      echo "Restoring gnupg settings for $USERNAME"' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '      restore_directory_from_usb /root/tempgnupg gnupg/$USERNAME' >> /usr/bin/$RESTORE_SCRIPT_NAME
@@ -3246,7 +3246,7 @@ function create_restore_script {
   fi
   echo 'if [ -d $USB_MOUNT/backup/procmail ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '  for d in /home/*/ ; do' >> /usr/bin/$RESTORE_SCRIPT_NAME
-  echo '    USERNAME=$(echo "$d" | awk -F ''/'' ''{print $3}'')' >> /usr/bin/$RESTORE_SCRIPT_NAME
+  echo '    USERNAME=$(echo "$d" | awk -F '"'"'/'"'"' '"'"'{print $3}'"'"')' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '    if [[ $USERNAME != "git" ]]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '      echo "Restoring procmail settings for $USERNAME"' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '      restore_directory_from_usb /root/tempprocmail procmail/$USERNAME' >> /usr/bin/$RESTORE_SCRIPT_NAME
@@ -3270,7 +3270,7 @@ function create_restore_script {
   fi
   echo 'if [ -d $USB_MOUNT/backup/spamassassin ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '  for d in /home/*/ ; do' >> /usr/bin/$RESTORE_SCRIPT_NAME
-  echo '    USERNAME=$(echo "$d" | awk -F ''/'' ''{print $3}'')' >> /usr/bin/$RESTORE_SCRIPT_NAME
+  echo '    USERNAME=$(echo "$d" | awk -F '"'"'/'"'"' '"'"'{print $3}'"'"')' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '    if [[ $USERNAME != "git" ]]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '      echo "Restoring spamassassin settings for $USERNAME"' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '      restore_directory_from_usb /root/tempspamassassin spamassassin/$USERNAME' >> /usr/bin/$RESTORE_SCRIPT_NAME
@@ -3332,7 +3332,7 @@ function create_restore_script {
   fi
   echo 'if [ -d $USB_MOUNT/backup/ssh ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '  for d in /home/*/ ; do' >> /usr/bin/$RESTORE_SCRIPT_NAME
-  echo '    USERNAME=$(echo "$d" | awk -F ''/'' ''{print $3}'')' >> /usr/bin/$RESTORE_SCRIPT_NAME
+  echo '    USERNAME=$(echo "$d" | awk -F '"'"'/'"'"' '"'"'{print $3}'"'"')' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '    if [[ $USERNAME != "git" ]]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '      echo "Restoring ssh keys for $USERNAME"' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '      restore_directory_from_usb /root/tempssh ssh/$USERNAME' >> /usr/bin/$RESTORE_SCRIPT_NAME
@@ -3374,7 +3374,7 @@ function create_restore_script {
   fi
   echo 'if [ -d $USB_MOUNT/backup/projects ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '  for d in /home/*/ ; do' >> /usr/bin/$RESTORE_SCRIPT_NAME
-  echo '    USERNAME=$(echo "$d" | awk -F ''/'' ''{print $3}'')' >> /usr/bin/$RESTORE_SCRIPT_NAME
+  echo '    USERNAME=$(echo "$d" | awk -F '"'"'/'"'"' '"'"'{print $3}'"'"')' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '    if [[ $USERNAME != "git" ]]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '      echo "Restoring projects for $USERNAME"' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '      restore_directory_from_usb /root/tempprojects projects/$USERNAME' >> /usr/bin/$RESTORE_SCRIPT_NAME
@@ -3400,7 +3400,7 @@ function create_restore_script {
   fi
   echo 'if [ -d $USB_MOUNT/backup/personal ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '  for d in /home/*/ ; do' >> /usr/bin/$RESTORE_SCRIPT_NAME
-  echo '    USERNAME=$(echo "$d" | awk -F ''/'' ''{print $3}'')' >> /usr/bin/$RESTORE_SCRIPT_NAME
+  echo '    USERNAME=$(echo "$d" | awk -F '"'"'/'"'"' '"'"'{print $3}'"'"')' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '    if [[ $USERNAME != "git" ]]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '      echo "Restoring personal settings for $USERNAME"' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '      restore_directory_from_usb /root/temppersonal personal/$USERNAME' >> /usr/bin/$RESTORE_SCRIPT_NAME
@@ -3503,7 +3503,7 @@ function create_restore_script {
       echo '  chown -R www-data:www-data /var/lib/owncloud/backup' >> /usr/bin/$RESTORE_SCRIPT_NAME
       echo '  chown -R www-data:www-data /var/lib/owncloud/assets' >> /usr/bin/$RESTORE_SCRIPT_NAME
       echo '  for d in /home/*/ ; do' >> /usr/bin/$RESTORE_SCRIPT_NAME
-      echo '    USERNAME=$(echo "$d" | awk -F ''/'' ''{print $3}'')' >> /usr/bin/$RESTORE_SCRIPT_NAME
+      echo '    USERNAME=$(echo "$d" | awk -F '"'"'/'"'"' '"'"'{print $3}'"'"')' >> /usr/bin/$RESTORE_SCRIPT_NAME
       echo '    if [[ $USERNAME != "git" ]]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
       echo '      occ files:scan $USERNAME' >> /usr/bin/$RESTORE_SCRIPT_NAME
       echo '    fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
@@ -3625,7 +3625,7 @@ function create_restore_script {
   echo "    sed -i 's|$FULLBLOG_DOMAIN_NAME.crt|$FULLBLOG_DOMAIN_NAME.bundle.crt|g' /etc/nginx/sites-available/$FULLBLOG_DOMAIN_NAME" >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '  for d in /home/*/ ; do' >> /usr/bin/$RESTORE_SCRIPT_NAME
-  echo '    USERNAME=$(echo "$d" | awk -F ''/'' ''{print $3}'')' >> /usr/bin/$RESTORE_SCRIPT_NAME
+  echo '    USERNAME=$(echo "$d" | awk -F '"'"'/'"'"' '"'"'{print $3}'"'"')' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '    if [[ $USERNAME != "git" ]]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo -n "      if [ -d /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/content" >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '/$USERNAME/blog/uncategorized/post ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
@@ -3664,7 +3664,7 @@ function create_restore_script {
   fi
   echo 'if [ -d $USB_MOUNT/backup/mail ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '  for d in /home/*/ ; do' >> /usr/bin/$RESTORE_SCRIPT_NAME
-  echo '    USERNAME=$(echo "$d" | awk -F ''/'' ''{print $3}'')' >> /usr/bin/$RESTORE_SCRIPT_NAME
+  echo '    USERNAME=$(echo "$d" | awk -F '"'"'/'"'"' '"'"'{print $3}'"'"')' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '    if [[ $USERNAME != "git" ]]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '      echo "Restoring emails for $USERNAME"' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '      restore_directory_from_usb /root/tempmail mail/$USERNAME' >> /usr/bin/$RESTORE_SCRIPT_NAME
@@ -4396,7 +4396,7 @@ function backup_to_friends_servers {
       echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
       echo '    # Social key management' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
       echo '    for d in /home/*/ ; do' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
-      echo '      USERNAME=$(echo "$d" | awk -F ''/'' ''{print $3}'')' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
+      echo '      USERNAME=$(echo "$d" | awk -F '"'"'/'"'"' '"'"'{print $3}'"'"')' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
       echo '      if [[ $USERNAME != "git" ]]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
       echo '        if [ -d /home/$USERNAME/.gnupg_fragments ]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
       echo '          if [ $REMOTE_DOMAIN ]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
@@ -4996,7 +4996,7 @@ function restore_from_friend {
       echo '  chown -R www-data:www-data /var/lib/owncloud/backup' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
       echo '  chown -R www-data:www-data /var/lib/owncloud/assets' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
       echo '  for d in /home/*/ ; do' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
-      echo '    USERNAME=$(echo "$d" | awk -F ''/'' ''{print $3}'')' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
+      echo '    USERNAME=$(echo "$d" | awk -F '"'"'/'"'"' '"'"'{print $3}'"'"')' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
       echo '    if [[ $USERNAME != "git" ]]; then' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
       echo '      occ files:scan $USERNAME' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
       echo '    fi' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
@@ -5106,7 +5106,7 @@ function restore_from_friend {
   echo '  fi' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
 
   echo '  for d in /home/*/ ; do' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
-  echo '    USERNAME=$(echo "$d" | awk -F ''/'' ''{print $3}'')' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
+  echo '    USERNAME=$(echo "$d" | awk -F '"'"'/'"'"' '"'"'{print $3}'"'"')' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
   echo '    if [[ $USERNAME != "git" ]]; then' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
 
   echo -n "      if [ -d /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/content" >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
@@ -6553,7 +6553,7 @@ function spam_filtering {
   # filtering scripts
   echo '#!/bin/bash' > /usr/bin/filterspam
   echo 'for d in /home/*/ ; do' >> /usr/bin/filterspam
-  echo '    USERNAME=$(echo "$d" | awk -F ''/'' ''{print $3}'')' >> /usr/bin/filterspam
+  echo '    USERNAME=$(echo "$d" | awk -F '"'"'/'"'"' '"'"'{print $3}'"'"')' >> /usr/bin/filterspam
   echo '    if [[ $USERNAME != "git" ]]; then' >> /usr/bin/filterspam
   echo '        MAILDIR=/home/$USERNAME/Maildir/.learn-spam' >> /usr/bin/filterspam
   echo '        if [ ! -d "$MAILDIR" ]; then' >> /usr/bin/filterspam
@@ -6575,7 +6575,7 @@ function spam_filtering {
 
   echo '#!/bin/bash' > /usr/bin/filterham
   echo 'for d in /home/*/ ; do' >> /usr/bin/filterham
-  echo '    USERNAME=$(echo "$d" | awk -F ''/'' ''{print $3}'')' >> /usr/bin/filterham
+  echo '    USERNAME=$(echo "$d" | awk -F '"'"'/'"'"' '"'"'{print $3}'"'"')' >> /usr/bin/filterham
   echo '    if [[ $USERNAME != "git" ]]; then' >> /usr/bin/filterham
   echo '        MAILDIR=/home/$USERNAME/Maildir/.learn-ham' >> /usr/bin/filterham
   echo '        if [ ! -d "$MAILDIR" ]; then' >> /usr/bin/filterham