diff --git a/src/freedombone b/src/freedombone
index 1a4de41d..c7b977a8 100755
--- a/src/freedombone
+++ b/src/freedombone
@@ -2552,7 +2552,7 @@ function create_backup_script {
   if grep -Fxq "install_gnu_social" $COMPLETION_FILE; then
       BACKUP_INCLUDES_DATABASES="yes"
       backup_database gnusocial
-      backup_directory_to_usb /root/tempgnusocialdata gnusocialdata
+      backup_directory_to_usb '/root/tempgnusocialdata' 'gnusocialdata'
       echo 'echo "Backing up GNU social installation"' >> /usr/bin/$BACKUP_SCRIPT_NAME
       backup_directory_to_usb /var/www/$MICROBLOG_DOMAIN_NAME/htdocs gnusocial
       echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
@@ -2560,7 +2560,7 @@ function create_backup_script {
   if grep -Fxq "install_hubzilla" $COMPLETION_FILE; then
       BACKUP_INCLUDES_DATABASES="yes"
       backup_database hubzilla
-      backup_directory_to_usb /root/temphubzilladata hubzilladata
+      backup_directory_to_usb '/root/temphubzilladata' 'hubzilladata'
       echo 'echo "Backing up Hubzilla installation"' >> /usr/bin/$BACKUP_SCRIPT_NAME
       backup_directory_to_usb /var/www/$HUBZILLA_DOMAIN_NAME/htdocs hubzilla
       echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
@@ -2571,10 +2571,10 @@ function create_backup_script {
       echo "  mkdir -p $USB_MOUNT/backup/owncloud2" >> /usr/bin/$BACKUP_SCRIPT_NAME
       echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
       backup_database owncloud
-      backup_directory_to_usb /root/tempownclouddata ownclouddata
+      backup_directory_to_usb '/root/tempownclouddata' 'ownclouddata'
       echo 'echo "Obtaining Owncloud data backup"' >> /usr/bin/$BACKUP_SCRIPT_NAME
-      backup_directory_to_usb /var/lib/owncloud owncloud
-      backup_directory_to_usb /etc/owncloud owncloud2
+      backup_directory_to_usb '/var/lib/owncloud' 'owncloud'
+      backup_directory_to_usb '/etc/owncloud' 'owncloud2'
       echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
   fi
   if grep -Fxq "install_gogs" $COMPLETION_FILE; then
@@ -2586,13 +2586,13 @@ function create_backup_script {
       echo "  mkdir -p $USB_MOUNT/backup/gogsssh" >> /usr/bin/$BACKUP_SCRIPT_NAME
       echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
       backup_database gogs
-      backup_directory_to_usb /root/tempgogsdata gogsdata
+      backup_directory_to_usb '/root/tempgogsdata' 'gogsdata'
       echo 'echo "Obtaining Gogs settings backup"' >> /usr/bin/$BACKUP_SCRIPT_NAME
-      backup_directory_to_usb /home/git/go/src/github.com/gogits/gogs/custom gogs
+      backup_directory_to_usb '/home/git/go/src/github.com/gogits/gogs/custom' 'gogs'
       echo 'echo "Obtaining Gogs repos backup"' >> /usr/bin/$BACKUP_SCRIPT_NAME
-      backup_directory_to_usb /home/git/gogs-repositories gogsrepos
+      backup_directory_to_usb '/home/git/gogs-repositories' 'gogsrepos'
       echo 'echo "Obtaining Gogs authorized_keys backup"' >> /usr/bin/$BACKUP_SCRIPT_NAME
-      backup_directory_to_usb /home/git/.ssh gogsssh
+      backup_directory_to_usb '/home/git/.ssh' 'gogsssh'
       echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
   fi
   if grep -Fxq "install_wiki" $COMPLETION_FILE; then
@@ -2603,8 +2603,8 @@ function create_backup_script {
       echo "  mkdir -p $USB_MOUNT/backup/wiki2" >> /usr/bin/$BACKUP_SCRIPT_NAME
       echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
       echo 'echo "Obtaining wiki data backup"' >> /usr/bin/$BACKUP_SCRIPT_NAME
-      backup_directory_to_usb /var/lib/dokuwiki wiki
-      backup_directory_to_usb /etc/dokuwiki wiki2
+      backup_directory_to_usb '/var/lib/dokuwiki' 'wiki'
+      backup_directory_to_usb '/etc/dokuwiki' 'wiki2'
       echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
   fi
   if grep -Fxq "install_blog" $COMPLETION_FILE; then
@@ -2612,7 +2612,7 @@ function create_backup_script {
       echo "  mkdir -p $USB_MOUNT/backup/blog" >> /usr/bin/$BACKUP_SCRIPT_NAME
       echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
       echo 'echo "Obtaining blog backup"' >> /usr/bin/$BACKUP_SCRIPT_NAME
-      backup_directory_to_usb /var/www/$FULLBLOG_DOMAIN_NAME/htdocs blog
+      backup_directory_to_usb "/var/www/$FULLBLOG_DOMAIN_NAME/htdocs" 'blog'
       echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
   fi
   if grep -Fxq "mesh_cjdns" $COMPLETION_FILE; then
@@ -2620,7 +2620,7 @@ function create_backup_script {
       echo "  mkdir -p $USB_MOUNT/backup/cjdns" >> /usr/bin/$BACKUP_SCRIPT_NAME
       echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
       echo 'echo "Obtaining cjdns backup"' >> /usr/bin/$BACKUP_SCRIPT_NAME
-      backup_directory_to_usb /etc/cjdns cjdns
+      backup_directory_to_usb '/etc/cjdns' 'cjdns'
       echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
   fi
 
@@ -2641,7 +2641,7 @@ function create_backup_script {
   echo "  if [ ! -d $USB_MOUNT/backup/projects ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
   echo "    mkdir -p $USB_MOUNT/backup/projects" >> /usr/bin/$BACKUP_SCRIPT_NAME
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
-  backup_directory_to_usb '/home/$MY_USERNAME/projects' projects
+  backup_directory_to_usb '/home/$MY_USERNAME/projects' 'projects'
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -2651,7 +2651,7 @@ function create_backup_script {
   echo "  if [ ! -d $USB_MOUNT/backup/personal ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
   echo "    mkdir -p $USB_MOUNT/backup/personal" >> /usr/bin/$BACKUP_SCRIPT_NAME
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
-  backup_directory_to_usb '/home/$MY_USERNAME/personal' personal
+  backup_directory_to_usb '/home/$MY_USERNAME/personal' 'personal'
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -2661,7 +2661,7 @@ function create_backup_script {
   echo "  if [ ! -d $USB_MOUNT/backup/mailinglist ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
   echo "    mkdir -p $USB_MOUNT/backup/mailinglist" >> /usr/bin/$BACKUP_SCRIPT_NAME
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
-  backup_directory_to_usb $PUBLIC_MAILING_LIST_DIRECTORY mailinglist
+  backup_directory_to_usb "$PUBLIC_MAILING_LIST_DIRECTORY" 'mailinglist'
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -2671,7 +2671,7 @@ function create_backup_script {
   echo "  if [ ! -d $USB_MOUNT/backup/xmpp ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
   echo "    mkdir -p $USB_MOUNT/backup/xmpp" >> /usr/bin/$BACKUP_SCRIPT_NAME
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
-  backup_directory_to_usb $XMPP_DIRECTORY xmpp
+  backup_directory_to_usb "$XMPP_DIRECTORY" "xmpp"
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -2681,7 +2681,7 @@ function create_backup_script {
   echo "  if [ ! -d $USB_MOUNT/backup/gnupg ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
   echo "    mkdir -p $USB_MOUNT/backup/gnupg" >> /usr/bin/$BACKUP_SCRIPT_NAME
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
-  backup_directory_to_usb '/home/$MY_USERNAME/.gnupg' gnupg
+  backup_directory_to_usb '/home/$MY_USERNAME/.gnupg' 'gnupg'
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -2691,7 +2691,7 @@ function create_backup_script {
   echo "  if [ ! -d $USB_MOUNT/backup/ssh ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
   echo "    mkdir -p $USB_MOUNT/backup/ssh" >> /usr/bin/$BACKUP_SCRIPT_NAME
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
-  backup_directory_to_usb '/home/$MY_USERNAME/.ssh' ssh
+  backup_directory_to_usb '/home/$MY_USERNAME/.ssh' 'ssh'
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -2701,7 +2701,7 @@ function create_backup_script {
   echo "  if [ ! -d $USB_MOUNT/backup/web ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
   echo "    mkdir -p $USB_MOUNT/backup/web" >> /usr/bin/$BACKUP_SCRIPT_NAME
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
-  backup_directory_to_usb /etc/nginx/sites-available web
+  backup_directory_to_usb '/etc/nginx/sites-available' 'web'
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -2715,7 +2715,7 @@ function create_backup_script {
   echo '    mkdir -p /home/$MY_USERNAME/tempbackup' >> /usr/bin/$BACKUP_SCRIPT_NAME
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
   echo '  cp -f /home/$MY_USERNAME/README /home/$MY_USERNAME/tempbackup' >> /usr/bin/$BACKUP_SCRIPT_NAME
-  backup_directory_to_usb '/home/$MY_USERNAME/tempbackup' readme
+  backup_directory_to_usb '/home/$MY_USERNAME/tempbackup' 'readme'
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -2732,7 +2732,7 @@ function create_backup_script {
   echo "  if [ ! -d $USB_MOUNT/backup/mutt ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
   echo "    mkdir -p $USB_MOUNT/backup/mutt" >> /usr/bin/$BACKUP_SCRIPT_NAME
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
-  backup_directory_to_usb '/home/$MY_USERNAME/tempbackup' mutt
+  backup_directory_to_usb '/home/$MY_USERNAME/tempbackup' 'mutt'
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -2746,7 +2746,7 @@ function create_backup_script {
   echo "  if [ ! -d $USB_MOUNT/backup/procmail ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
   echo "    mkdir -p $USB_MOUNT/backup/procmail" >> /usr/bin/$BACKUP_SCRIPT_NAME
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
-  backup_directory_to_usb '/home/$MY_USERNAME/tempbackup' procmail
+  backup_directory_to_usb '/home/$MY_USERNAME/tempbackup' 'procmail'
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -2756,7 +2756,7 @@ function create_backup_script {
   echo "  if [ ! -d $USB_MOUNT/backup/spamassassin ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
   echo "    mkdir -p $USB_MOUNT/backup/spamassassin" >> /usr/bin/$BACKUP_SCRIPT_NAME
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
-  backup_directory_to_usb '/home/$MY_USERNAME/.spamassassin' spamassassin
+  backup_directory_to_usb '/home/$MY_USERNAME/.spamassassin' 'spamassassin'
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -2771,7 +2771,7 @@ function create_backup_script {
   echo "  if [ ! -d $USB_MOUNT/backup/mail ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
   echo "    mkdir -p $USB_MOUNT/backup/mail" >> /usr/bin/$BACKUP_SCRIPT_NAME
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
-  backup_directory_to_usb /root/tempbackupemail mail
+  backup_directory_to_usb '/root/tempbackupemail' 'mail'
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -2781,7 +2781,7 @@ function create_backup_script {
   echo "  if [ ! -d $USB_MOUNT/backup/dlna ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
   echo "    mkdir -p $USB_MOUNT/backup/dlna" >> /usr/bin/$BACKUP_SCRIPT_NAME
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
-  backup_directory_to_usb /var/cache/minidlna dlna
+  backup_directory_to_usb '/var/cache/minidlna' 'dlna'
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -2798,7 +2798,7 @@ function create_backup_script {
   echo "  if [ ! -d $USB_MOUNT/backup/voip ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
   echo "    mkdir -p $USB_MOUNT/backup/voip" >> /usr/bin/$BACKUP_SCRIPT_NAME
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
-  backup_directory_to_usb '/home/$MY_USERNAME/tempbackup' voip
+  backup_directory_to_usb '/home/$MY_USERNAME/tempbackup' 'voip'
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -2820,7 +2820,7 @@ function create_backup_script {
       echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
       echo 'echo "$DATABASE_PASSWORD" > /root/tempmariadb/db' >> /usr/bin/$BACKUP_SCRIPT_NAME
       echo 'chmod 400 /root/tempmariadb/db' >> /usr/bin/$BACKUP_SCRIPT_NAME
-      backup_directory_to_usb /root/tempmariadb mariadb
+      backup_directory_to_usb '/root/tempmariadb' 'mariadb'
       echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
   fi
 
@@ -2831,7 +2831,7 @@ function create_backup_script {
   echo "    mkdir -p $USB_MOUNT/backup/tox" >> /usr/bin/$BACKUP_SCRIPT_NAME
   echo '  fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
   echo "  cp /etc/tox-bootstrapd.conf /var/lib/tox-bootstrapd" >> /usr/bin/$BACKUP_SCRIPT_NAME
-  backup_directory_to_usb /var/lib/tox-bootstrapd tox
+  backup_directory_to_usb '/var/lib/tox-bootstrapd' 'tox'
   echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
   echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
 
@@ -2881,7 +2881,7 @@ function restore_database {
   echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo "if [ -d $USB_MOUNT/backup/${1} ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo "  echo \"Restoring ${1} database\"" >> /usr/bin/$RESTORE_SCRIPT_NAME
-  restore_directory_from_usb /root/temp${1}data ${1}data
+  restore_directory_from_usb "/root/temp${1}data" "${1}data"
   echo "  if [ ! -f /root/temp${1}data/${RESTORE_SUBDIR}/temp${1}data/${1}.sql ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo "    echo \"Unable to restore ${1} database\"" >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '    rm -rf /root/temp${1}data' >> /usr/bin/$RESTORE_SCRIPT_NAME
@@ -2903,7 +2903,7 @@ function restore_database {
   echo "  if [ ! -d /root/temp${1} ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo "    mkdir /root/temp${1}" >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
-  restore_directory_from_usb /root/temp${1} ${1}
+  restore_directory_from_usb "/root/temp${1}" "${1}"
   if [[ $BACKUP_TYPE != 'obnam' ]]; then
       RESTORE_SUBDIR="usb/backup/${1}"
   fi
@@ -3040,7 +3040,7 @@ function create_restore_script {
       fi
       echo "if [ -d $USB_MOUNT/backup/mariadb ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
       echo '  echo "Restoring mysql settings"' >> /usr/bin/$RESTORE_SCRIPT_NAME
-      restore_directory_from_usb /root/tempmariadb mariadb
+      restore_directory_from_usb '/root/tempmariadb' 'mariadb'
       echo '  echo "Get the MariaDB password from the backup"' >> /usr/bin/$RESTORE_SCRIPT_NAME
       echo "  if [ ! -f /root/tempmariadb/${RESTORE_SUBDIR}tempmariadb/db ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
       echo '    echo "MariaDB password file not found"' >> /usr/bin/$RESTORE_SCRIPT_NAME
@@ -3085,7 +3085,7 @@ function create_restore_script {
   fi
   echo "if [ -d $USB_MOUNT/backup/mutt ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '  echo "Restoring Mutt settings"' >> /usr/bin/$RESTORE_SCRIPT_NAME
-  restore_directory_from_usb /root/tempmutt mutt
+  restore_directory_from_usb '/root/tempmutt' 'mutt'
   echo -n "  if [ -f /root/tempmutt/${RESTORE_SUBDIR}" >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '$MY_USERNAME/tempbackup/.muttrc ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo -n "    cp -f /root/tempmutt/${RESTORE_SUBDIR}" >> /usr/bin/$RESTORE_SCRIPT_NAME
@@ -3112,7 +3112,7 @@ function create_restore_script {
   fi
   echo "if [ -d $USB_MOUNT/backup/gnupg ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '  echo "Restoring gnupg settings"' >> /usr/bin/$RESTORE_SCRIPT_NAME
-  restore_directory_from_usb /root/tempgnupg gnupg
+  restore_directory_from_usb '/root/tempgnupg' 'gnupg'
   echo -n "  cp -r /root/tempgnupg/${RESTORE_SUBDIR}" >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '$MY_USERNAME/.gnupg /home/$MY_USERNAME/' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
@@ -3137,7 +3137,7 @@ function create_restore_script {
   fi
   echo "if [ -d $USB_MOUNT/backup/procmail ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '  echo "Restoring procmail settings"' >> /usr/bin/$RESTORE_SCRIPT_NAME
-  restore_directory_from_usb /root/tempprocmail procmail
+  restore_directory_from_usb '/root/tempprocmail' 'procmail'
   echo -n "  cp -f /root/tempprocmail/${RESTORE_SUBDIR}" >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '$MY_USERNAME/tempbackup/.procmailrc /home/$MY_USERNAME/' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
@@ -3156,7 +3156,7 @@ function create_restore_script {
   fi
   echo "if [ -d $USB_MOUNT/backup/spamassassin ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '  echo "Restoring spamassassin settings"' >> /usr/bin/$RESTORE_SCRIPT_NAME
-  restore_directory_from_usb /root/tempspamassassin spamassassin
+  restore_directory_from_usb '/root/tempspamassassin' 'spamassassin'
   echo -n "  cp -rf /root/tempspamassassin/${RESTORE_SUBDIR}" >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '$MY_USERNAME/.spamassassin /home/$MY_USERNAME/' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
@@ -3175,7 +3175,7 @@ function create_restore_script {
   fi
   echo "if [ -d $USB_MOUNT/backup/readme ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '  echo "Restoring README"' >> /usr/bin/$RESTORE_SCRIPT_NAME
-  restore_directory_from_usb /root/tempreadme readme
+  restore_directory_from_usb '/root/tempreadme' 'readme'
   echo -n "  cp -f /root/tempreadme/${RESTORE_SUBDIR}" >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '$MY_USERNAME/tempbackup/README /home/$MY_USERNAME/' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
@@ -3194,7 +3194,7 @@ function create_restore_script {
   fi
   echo "if [ -d $USB_MOUNT/backup/ssh ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '  echo "Restoring ssh keys"' >> /usr/bin/$RESTORE_SCRIPT_NAME
-  restore_directory_from_usb /root/tempssh ssh
+  restore_directory_from_usb '/root/tempssh' 'ssh'
   echo -n "  cp -r /root/tempssh/${RESTORE_SUBDIR}" >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '$MY_USERNAME/.ssh /home/$MY_USERNAME/' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
@@ -3214,7 +3214,7 @@ function create_restore_script {
   echo "if [ -d $USB_MOUNT/backup/ssl ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '  echo "Restoring certificates"' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '  mkdir /root/tempssl' >> /usr/bin/$RESTORE_SCRIPT_NAME
-  restore_directory_from_usb /root/tempssl ssl
+  restore_directory_from_usb '/root/tempssl' 'ssl'
   echo "  cp -r /root/tempssl/${RESTORE_SUBDIR}ssl/* /etc/ssl" >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
@@ -3231,7 +3231,7 @@ function create_restore_script {
   fi
   echo "if [ -d $USB_MOUNT/backup/projects ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '  echo "Restoring projects"' >> /usr/bin/$RESTORE_SCRIPT_NAME
-  restore_directory_from_usb /root/tempprojects projects
+  restore_directory_from_usb '/root/tempprojects' 'projects'
   echo '  if [ -d /home/$MY_USERNAME/projects ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '    rm -rf /home/$MY_USERNAME/projects' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
@@ -3252,7 +3252,7 @@ function create_restore_script {
   fi
   echo "if [ -d $USB_MOUNT/backup/personal ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '  echo "Restoring personal settings"' >> /usr/bin/$RESTORE_SCRIPT_NAME
-  restore_directory_from_usb /root/temppersonal personal
+  restore_directory_from_usb '/root/temppersonal' 'personal'
   echo '  if [ -d /home/$MY_USERNAME/personal ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '    rm -rf /home/$MY_USERNAME/personal' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
@@ -3273,7 +3273,7 @@ function create_restore_script {
   fi
   echo "if [ -d $PUBLIC_MAILING_LIST_DIRECTORY ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '  echo "Restoring public mailing list"' >> /usr/bin/$RESTORE_SCRIPT_NAME
-  restore_directory_from_usb /root/tempmailinglist mailinglist
+  restore_directory_from_usb '/root/tempmailinglist' 'mailinglist'
   echo "  cp -r /root/tempmailinglist/${RESTORE_SUBDIR}spool/mlmmj/* $PUBLIC_MAILING_LIST_DIRECTORY" >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
@@ -3290,7 +3290,7 @@ function create_restore_script {
   fi
   echo "if [ -d $XMPP_DIRECTORY ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '  echo "Restoring XMPP settings"' >> /usr/bin/$RESTORE_SCRIPT_NAME
-  restore_directory_from_usb /root/tempxmpp xmpp
+  restore_directory_from_usb '/root/tempxmpp' 'xmpp'
   echo "  cp -r /root/tempxmpp/${RESTORE_SUBDIR}lib/prosody/* $XMPP_DIRECTORY" >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
@@ -3337,7 +3337,7 @@ function create_restore_script {
       BACKUP_INCLUDES_WEBSITES="yes"
       restore_database owncloud $OWNCLOUD_DOMAIN_NAME
       echo "if [ -d $USB_MOUNT/backup/owncloud2 ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
-      restore_directory_from_usb /root/tempowncloud2 owncloud2
+      restore_directory_from_usb '/root/tempowncloud2' 'owncloud2'
       echo "  cp -r /root/tempowncloud2/${RESTORE_SUBDIR}owncloud/* /etc/owncloud/" >> /usr/bin/$RESTORE_SCRIPT_NAME
       echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
       echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
@@ -3373,7 +3373,7 @@ function create_restore_script {
       echo '    exit 981' >> /usr/bin/$RESTORE_SCRIPT_NAME
       echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
       echo '  echo "Restoring Gogs repos"' >> /usr/bin/$RESTORE_SCRIPT_NAME
-      restore_directory_from_usb /root/tempgogsrepos gogsrepos
+      restore_directory_from_usb '/root/tempgogsrepos' 'gogsrepos'
       if [[ $BACKUP_TYPE != 'obnam' ]]; then
           RESTORE_SUBDIR='usb/backup/gogsrepos'
       fi
@@ -3384,7 +3384,7 @@ function create_restore_script {
       echo '    exit 67574' >> /usr/bin/$RESTORE_SCRIPT_NAME
       echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
       echo '  echo "Restoring Gogs authorized_keys"' >> /usr/bin/$RESTORE_SCRIPT_NAME
-      restore_directory_from_usb /root/tempgogsssh gogsssh
+      restore_directory_from_usb '/root/tempgogsssh' 'gogsssh'
       echo '  if [ ! -d /home/git/.ssh ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
       echo '    mkdir /home/git/.ssh' >> /usr/bin/$RESTORE_SCRIPT_NAME
       echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
@@ -3411,14 +3411,14 @@ function create_restore_script {
   fi
   echo "if [ -d $USB_MOUNT/backup/wiki ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '  echo "Restoring Wiki installation"' >> /usr/bin/$RESTORE_SCRIPT_NAME
-  restore_directory_from_usb /root/tempwiki wiki
+  restore_directory_from_usb '/root/tempwiki' 'wiki'
   echo "  cp -r /root/tempwiki/${RESTORE_SUBDIR}/lib/dokuwiki/* /var/lib/dokuwiki/" >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo "    rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '    exit 868' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
-  restore_directory_from_usb /root/tempwiki2 wiki2
+  restore_directory_from_usb '/root/tempwiki2' 'wiki2'
   if [[ $BACKUP_TYPE != 'obnam' ]]; then
       RESTORE_SUBDIR='usb/backup/wiki2'
   fi
@@ -3444,7 +3444,7 @@ function create_restore_script {
   fi
   echo "if [ -d $USB_MOUNT/backup/blog ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '  echo "Restoring blog installation"' >> /usr/bin/$RESTORE_SCRIPT_NAME
-  restore_directory_from_usb /root/tempblog blog
+  restore_directory_from_usb '/root/tempblog' 'blog'
   echo "  rm -rf /var/www/$FULLBLOG_DOMAIN_NAME/htdocs" >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo "  cp -r /root/tempblog/${RESTORE_SUBDIR}/www/$FULLBLOG_DOMAIN_NAME/htdocs /var/www/$FULLBLOG_DOMAIN_NAME/" >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
@@ -3473,7 +3473,7 @@ function create_restore_script {
   fi
   echo "if [ -d $USB_MOUNT/backup/cjdns ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '  echo "Restoring cjdns installation"' >> /usr/bin/$RESTORE_SCRIPT_NAME
-  restore_directory_from_usb /root/tempcjdns cjdns
+  restore_directory_from_usb '/root/tempcjdns' 'cjdns'
   echo "  rm -rf /etc/cjdns" >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo "  cp -r /root/tempcjdns/${RESTORE_SUBDIR}/cjdns /etc/" >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
@@ -3491,7 +3491,7 @@ function create_restore_script {
   fi
   echo "if [ -d $USB_MOUNT/backup/mail ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '  echo "Restoring emails"' >> /usr/bin/$RESTORE_SCRIPT_NAME
-  restore_directory_from_usb /root/tempmail mail
+  restore_directory_from_usb '/root/tempmail' 'mail'
   echo '  if [ ! -d /home/$MY_USERNAME/Maildir ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '    mkdir /home/$MY_USERNAME/Maildir' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
@@ -3512,7 +3512,7 @@ function create_restore_script {
   echo "if [ -d /var/cache/minidlna ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo "  if [ -d $USB_MOUNT/backup/dlna ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '    echo "Restoring DLNA cache"' >> /usr/bin/$RESTORE_SCRIPT_NAME
-  restore_directory_from_usb /root/tempdlna dlna
+  restore_directory_from_usb '/root/tempdlna' 'dlna'
   echo "    cp -r /root/tempdlna/${RESTORE_SUBDIR}/cache/minidlna/* /var/cache/minidlna/" >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '    if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo "      umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
@@ -3530,7 +3530,7 @@ function create_restore_script {
   fi
   echo "if [ -d $USB_MOUNT/backup/voip ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '  echo "Restoring VoIP settings"' >> /usr/bin/$RESTORE_SCRIPT_NAME
-  restore_directory_from_usb /root/tempvoip voip
+  restore_directory_from_usb '/root/tempvoip' 'voip'
   echo -n "  cp -f /root/tempvoip/${RESTORE_SUBDIR}/" >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo -n '$MY_USERNAME/tempbackup/' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo "$VOIP_CONFIG_FILE /etc/" >> /usr/bin/$RESTORE_SCRIPT_NAME
@@ -3552,7 +3552,7 @@ function create_restore_script {
 
   echo "if [ -d $USB_MOUNT/backup/tox ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '  echo "Restoring Tox node settings"' >> /usr/bin/$RESTORE_SCRIPT_NAME
-  restore_directory_from_usb /var/lib/tox-bootstrapd tox
+  restore_directory_from_usb '/var/lib/tox-bootstrapd' 'tox'
   echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo "    rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
@@ -3813,17 +3813,17 @@ function backup_to_friends_servers {
   if grep -Fxq "install_gnu_social" $COMPLETION_FILE; then
       BACKUP_INCLUDES_DATABASES="yes"
       backup_database_to_friend gnusocial
-      backup_directory_to_friend /root/tempgnusocialdata gnusocialdata
+      backup_directory_to_friend '/root/tempgnusocialdata' 'gnusocialdata'
       echo 'echo "Backing up GNU social installation"' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
-      backup_directory_to_friend /var/www/$MICROBLOG_DOMAIN_NAME/htdocs gnusocial
+      backup_directory_to_friend "/var/www/$MICROBLOG_DOMAIN_NAME/htdocs" 'gnusocial'
       echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
   fi
   if grep -Fxq "install_hubzilla" $COMPLETION_FILE; then
       BACKUP_INCLUDES_DATABASES="yes"
       backup_database_to_friend hubzilla
-      backup_directory_to_friend /root/temphubzilladata hubzilladata
+      backup_directory_to_friend '/root/temphubzilladata' 'hubzilladata'
       echo 'echo "Backing up Hubzilla installation"' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
-      backup_directory_to_friend /var/www/$HUBZILLA_DOMAIN_NAME/htdocs hubzilla
+      backup_directory_to_friend "/var/www/$HUBZILLA_DOMAIN_NAME/htdocs" 'hubzilla'
       echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
   fi
   if grep -Fxq "install_owncloud" $COMPLETION_FILE; then
@@ -3832,10 +3832,10 @@ function backup_to_friends_servers {
       echo '  mkdir -p $SERVER_DIRECTORY/backup/owncloud2' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
       echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
       backup_database_to_friend owncloud
-      backup_directory_to_friend /root/tempownclouddata ownclouddata
+      backup_directory_to_friend '/root/tempownclouddata' 'ownclouddata'
       echo 'echo "Obtaining Owncloud data backup"' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
-      backup_directory_to_friend /var/lib/owncloud owncloud
-      backup_directory_to_friend /etc/owncloud owncloud2
+      backup_directory_to_friend '/var/lib/owncloud' 'owncloud'
+      backup_directory_to_friend '/etc/owncloud' 'owncloud2'
       echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
   fi
 
@@ -3848,14 +3848,14 @@ function backup_to_friends_servers {
       echo '  mkdir -p $SERVER_DIRECTORY/backup/gogsssh' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
       echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
       backup_database_to_friend gogs
-      backup_directory_to_friend /root/tempgogsdata gogsdata
+      backup_directory_to_friend '/root/tempgogsdata' 'gogsdata'
       echo 'echo "Obtaining Gogs settings backup"' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
-      backup_directory_to_friend /home/git/go/src/github.com/gogits/gogs/custom gogs
+      backup_directory_to_friend '/home/git/go/src/github.com/gogits/gogs/custom' 'gogs'
       echo 'echo "Obtaining Gogs repos backup"' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
-      backup_directory_to_friend /home/git/gogs-repositories gogsrepos
+      backup_directory_to_friend '/home/git/gogs-repositories' 'gogsrepos'
 
       echo 'echo "Obtaining Gogs authorized_keys backup"' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
-      backup_directory_to_friend /home/git/.ssh gogsssh
+      backup_directory_to_friend '/home/git/.ssh' 'gogsssh'
       echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
   fi
 
@@ -3867,8 +3867,8 @@ function backup_to_friends_servers {
       echo '  mkdir -p $SERVER_DIRECTORY/backup/wiki2' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
       echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
       echo 'echo "Obtaining wiki data backup"' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
-      backup_directory_to_friend /var/lib/dokuwiki wiki
-      backup_directory_to_friend /etc/dokuwiki wiki2
+      backup_directory_to_friend '/var/lib/dokuwiki' 'wiki'
+      backup_directory_to_friend '/etc/dokuwiki' 'wiki2'
       echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
   fi
   if grep -Fxq "install_blog" $COMPLETION_FILE; then
@@ -3876,7 +3876,7 @@ function backup_to_friends_servers {
       echo '  mkdir -p $SERVER_DIRECTORY/backup/blog' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
       echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
       echo 'echo "Obtaining blog backup"' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
-      backup_directory_to_friend /var/www/$FULLBLOG_DOMAIN_NAME/htdocs blog
+      backup_directory_to_friend "/var/www/$FULLBLOG_DOMAIN_NAME/htdocs" 'blog'
       echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
   fi
   if grep -Fxq "mesh_cjdns" $COMPLETION_FILE; then
@@ -3884,7 +3884,7 @@ function backup_to_friends_servers {
       echo '  mkdir -p $SERVER_DIRECTORY/backup/cjdns' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
       echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
       echo 'echo "Obtaining cjdns backup"' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
-      backup_directory_to_friend /etc/cjdns cjdns
+      backup_directory_to_friend '/etc/cjdns' 'cjdns'
       echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
   fi
 
@@ -3895,7 +3895,7 @@ function backup_to_friends_servers {
   echo '  if [ ! -d $SERVER_DIRECTORY/backup/ssl ]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
   echo '    mkdir -p $SERVER_DIRECTORY/backup/ssl' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
   echo '  fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
-  backup_directory_to_friend /etc/ssl ssl
+  backup_directory_to_friend '/etc/ssl' 'ssl'
   echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
   echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
 
@@ -3905,7 +3905,7 @@ function backup_to_friends_servers {
   echo '  if [ ! -d $SERVER_DIRECTORY/backup/projects ]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
   echo '    mkdir -p $SERVER_DIRECTORY/backup/projects' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
   echo '  fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
-  backup_directory_to_friend '/home/$MY_USERNAME/projects' projects
+  backup_directory_to_friend '/home/$MY_USERNAME/projects' 'projects'
   echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
   echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
 
@@ -3915,7 +3915,7 @@ function backup_to_friends_servers {
   echo '  if [ ! -d $SERVER_DIRECTORY/backup/personal ]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
   echo '    mkdir -p $SERVER_DIRECTORY/backup/personal' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
   echo '  fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
-  backup_directory_to_friend '/home/$MY_USERNAME/personal' personal
+  backup_directory_to_friend '/home/$MY_USERNAME/personal' 'personal'
   echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
   echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
 
@@ -3925,7 +3925,7 @@ function backup_to_friends_servers {
   echo '  if [ ! -d $SERVER_DIRECTORY/backup/mailinglist ]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
   echo '    mkdir -p $SERVER_DIRECTORY/backup/mailinglist' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
   echo '  fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
-  backup_directory_to_friend $PUBLIC_MAILING_LIST_DIRECTORY mailinglist
+  backup_directory_to_friend "$PUBLIC_MAILING_LIST_DIRECTORY" 'mailinglist'
   echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
   echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
 
@@ -3935,7 +3935,7 @@ function backup_to_friends_servers {
   echo '  if [ ! -d $SERVER_DIRECTORY/backup/xmpp ]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
   echo '    mkdir -p $SERVER_DIRECTORY/backup/xmpp' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
   echo '  fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
-  backup_directory_to_friend $XMPP_DIRECTORY xmpp
+  backup_directory_to_friend "$XMPP_DIRECTORY" 'xmpp'
   echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
   echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
 
@@ -3945,7 +3945,7 @@ function backup_to_friends_servers {
   echo '  if [ ! -d $SERVER_DIRECTORY/backup/gnupg ]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
   echo '    mkdir -p $SERVER_DIRECTORY/backup/gnupg' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
   echo '  fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
-  backup_directory_to_friend '/home/$MY_USERNAME/.gnupg' gnupg
+  backup_directory_to_friend '/home/$MY_USERNAME/.gnupg' 'gnupg'
   echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
   echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
 
@@ -3955,7 +3955,7 @@ function backup_to_friends_servers {
   echo '  if [ ! -d $SERVER_DIRECTORY/backup/ssh ]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
   echo '    mkdir -p $SERVER_DIRECTORY/backup/ssh' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
   echo '  fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
-  backup_directory_to_friend '/home/$MY_USERNAME/.ssh' ssh
+  backup_directory_to_friend '/home/$MY_USERNAME/.ssh' 'ssh'
   echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
   echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
 
@@ -3965,7 +3965,7 @@ function backup_to_friends_servers {
   echo '  if [ ! -d $SERVER_DIRECTORY/backup/web ]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
   echo '    mkdir -p $SERVER_DIRECTORY/backup/web' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
   echo '  fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
-  backup_directory_to_friend /etc/nginx/sites-available web
+  backup_directory_to_friend '/etc/nginx/sites-available' 'web'
   echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
   echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
 
@@ -3979,7 +3979,7 @@ function backup_to_friends_servers {
   echo '    mkdir -p /home/$MY_USERNAME/tempbackup' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
   echo '  fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
   echo '  cp -f /home/$MY_USERNAME/README /home/$MY_USERNAME/tempbackup' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
-  backup_directory_to_friend '/home/$MY_USERNAME/tempbackup' readme
+  backup_directory_to_friend '/home/$MY_USERNAME/tempbackup' 'readme'
   echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
   echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
 
@@ -3996,7 +3996,7 @@ function backup_to_friends_servers {
   echo '  if [ ! -d $SERVER_DIRECTORY/backup/mutt ]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
   echo '    mkdir -p $SERVER_DIRECTORY/backup/mutt' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
   echo '  fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
-  backup_directory_to_friend '/home/$MY_USERNAME/tempbackup' mutt
+  backup_directory_to_friend '/home/$MY_USERNAME/tempbackup' 'mutt'
   echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
   echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
 
@@ -4010,7 +4010,7 @@ function backup_to_friends_servers {
   echo '  if [ ! -d $SERVER_DIRECTORY/backup/procmail ]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
   echo '    mkdir -p $SERVER_DIRECTORY/backup/procmail' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
   echo '  fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
-  backup_directory_to_friend '/home/$MY_USERNAME/tempbackup' procmail
+  backup_directory_to_friend '/home/$MY_USERNAME/tempbackup' 'procmail'
   echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
   echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
 
@@ -4020,7 +4020,7 @@ function backup_to_friends_servers {
   echo '  if [ ! -d $SERVER_DIRECTORY/backup/spamassassin ]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
   echo '    mkdir -p $SERVER_DIRECTORY/backup/spamassassin' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
   echo '  fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
-  backup_directory_to_friend '/home/$MY_USERNAME/.spamassassin' spamassassin
+  backup_directory_to_friend '/home/$MY_USERNAME/.spamassassin' 'spamassassin'
   echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
   echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
 
@@ -4035,7 +4035,7 @@ function backup_to_friends_servers {
   echo '  if [ ! -d $SERVER_DIRECTORY/backup/mail ]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
   echo '    mkdir -p $SERVER_DIRECTORY/backup/mail' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
   echo '  fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
-  backup_directory_to_friend /root/backupemail mail
+  backup_directory_to_friend '/root/backupemail' 'mail'
   echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
   echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
 
@@ -4045,7 +4045,7 @@ function backup_to_friends_servers {
   echo '  if [ ! -d $SERVER_DIRECTORY/backup/dlna ]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
   echo '    mkdir -p $SERVER_DIRECTORY/backup/dlna' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
   echo '  fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
-  backup_directory_to_friend /var/cache/minidlna dlna
+  backup_directory_to_friend '/var/cache/minidlna' 'dlna'
   echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
   echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
 
@@ -4062,7 +4062,7 @@ function backup_to_friends_servers {
   echo '  if [ ! -d $SERVER_DIRECTORY/backup/voip ]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
   echo '    mkdir -p $SERVER_DIRECTORY/backup/voip' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
   echo '  fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
-  backup_directory_to_friend '/home/$MY_USERNAME/tempbackup' voip
+  backup_directory_to_friend '/home/$MY_USERNAME/tempbackup' 'voip'
   echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
   echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
 
@@ -4073,7 +4073,7 @@ function backup_to_friends_servers {
   echo '    mkdir -p $SERVER_DIRECTORY/backup/tox' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
   echo '  fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
   echo '  cp /etc/tox-bootstrapd.conf /var/lib/tox-bootstrapd' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
-  backup_directory_to_friend /var/lib/tox-bootstrapd tox
+  backup_directory_to_friend '/var/lib/tox-bootstrapd' 'tox'
   echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
   echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
 
@@ -4096,7 +4096,7 @@ function backup_to_friends_servers {
       echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
       echo 'echo "$DATABASE_PASSWORD" > /root/tempmariadb/db' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
       echo 'chmod 400 /root/tempmariadb/db' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
-      backup_directory_to_friend /root/tempmariadb mariadb
+      backup_directory_to_friend '/root/tempmariadb' 'mariadb'
       echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
   fi