Consolidate drive mount/unmount functions

src/freedombone-backup-local

 export TEXTDOMAIN=${PROJECT_NAME}-backup-local
 export TEXTDOMAINDIR="/usr/share/locale"
 
-# include utils which allow function_check
+# include utils which allow function_check and drive mount
 UTILS_FILES=/usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-*
 for f in $UTILS_FILES
 do
 backup_mariadb
 backup_extra_directories
 backup_unmount_drive $USB_DRIVE $USB_MOUNT
+echo $"Backup to USB drive is complete. You can now unplug it."
 
 exit 0

src/freedombone-restore-local

 export TEXTDOMAIN=${PROJECT_NAME}-restore-local
 export TEXTDOMAINDIR="/usr/share/locale"
 
+# include utils which allow function_check and drive mount
+UTILS_FILES=/usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-*
+for f in $UTILS_FILES
+do
+  source $f
+done
+
 USB_DRIVE=/dev/sdb1
 USB_MOUNT=/mnt/usb
 
 GO_VERSION=$(cat /usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-go | grep 'GO_VERSION=' | head -n 1 | awk -F '=' '{print $2}')
 GVM_HOME=$(cat /usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-go | grep 'GVM_HOME=' | head -n 1 | awk -F '=' '{print $2}')
 
-ADMIN_USERNAME=
+ADMIN_USERNAME=''
 ADMIN_NAME=
+if [ -f $COMPLETION_FILE ]; then
+	ADMIN_USERNAME=$(cat $COMPLETION_FILE | grep "Admin user" | awk -F ':' '{print $2}')
+fi
 
 # MariaDB password
 DATABASE_PASSWORD=$(cat /root/dbpass)
 WIKI_DOMAIN_NAME=
 FULLBLOG_DOMAIN_NAME=
 
-function mount_drive {
-	if [ $1 ]; then
-		USB_DRIVE=/dev/${1}1
-	fi
-
-	if [ $2 ]; then
-		RESTORE_APP=$2
-	fi
-
-	# get the admin user
-	ADMIN_USERNAME=$(cat $COMPLETION_FILE | grep "Admin user" | awk -F ':' '{print $2}')
-	if [ $3 ]; then
-		ADMIN_USERNAME=$3
-	fi
-	ADMIN_NAME=$(getent passwd $ADMIN_USERNAME | cut -d: -f5 | cut -d, -f1)
-
-	# check that the backup destination is available
-	if [ ! -b $USB_DRIVE ]; then
-		echo $"Please attach a USB drive"
-		exit 1
-	fi
-
-	# unmount if already mounted
-	umount -f $USB_MOUNT
-	if [ ! -d $USB_MOUNT ]; then
-		mkdir $USB_MOUNT
-	fi
-	if [ -f /dev/mapper/encrypted_usb ]; then
-		rm -rf /dev/mapper/encrypted_usb
-	fi
-	cryptsetup luksClose encrypted_usb
-
-	# mount the encrypted backup drive
-	cryptsetup luksOpen $USB_DRIVE encrypted_usb
-	if [ "$?" = "0" ]; then
-		USB_DRIVE=/dev/mapper/encrypted_usb
-	fi
-	mount $USB_DRIVE $USB_MOUNT
-	if [ ! "$?" = "0" ]; then
-		echo $"There was a problem mounting the USB drive to $USB_MOUNT"
-		rm -rf $USB_MOUNT
-		exit 2
-	fi
-}
-
-function unmount_drive {
-	sync
-	umount $USB_MOUNT
-	if [ ! "$?" = "0" ]; then
-		echo $"Unable to unmount the drive. This means that the backup did not work"
-		rm -rf $USB_MOUNT
-		exit 9
-	fi
-	rm -rf $USB_MOUNT
-
+# after user files have been restored permissions may need to be set
+function set_user_permissions {
 	echo $"Setting permissions"
 	for d in /home/*/ ; do
 		USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
 			chown -R $USERNAME:$USERNAME /home/$USERNAME
 		fi
 	done
-
-	if [[ $USB_DRIVE == /dev/mapper/encrypted_usb ]]; then
-		echo $"Unmount encrypted USB"
-		cryptsetup luksClose encrypted_usb
-	fi
-	if [ -f /dev/mapper/encrypted_usb ]; then
-		rm -rf /dev/mapper/encrypted_usb
-	fi
 }
 
 function check_backup_exists {
 	if [ ! -d $USB_MOUNT/backup ]; then
 		echo $"No backup directory found on the USB drive."
-		unmount_drive
+		set_user_permissions
+		backup_unmount_drive
 		exit 2
 	fi
 }
 	echo $"Checking that admin user exists"
 	if [ ! -d /home/$ADMIN_USERNAME ]; then
 		echo $"Username $ADMIN_USERNAME not found. Reinstall ${PROJECT_NAME} with this username."
-		unmount_drive
+		set_user_permissions
+		backup_unmount_drive
 		exit 295
 	fi
 }
 		if [ ! -f /root/temp${1}data/${RESTORE_SUBDIR}/temp${1}data/${1}.sql ]; then
 			echo $"Unable to restore ${1} database"
 			rm -rf /root/temp${1}data
-			unmount_drive
+			set_user_permissions
+			backup_unmount_drive
 			exit 503
 		fi
 		mysqlsuccess=$(mysql -u root --password=$DATABASE_PASSWORD ${1} -o < /root/temp${1}data/${RESTORE_SUBDIR}/temp${1}data/${1}.sql)
 		if [ ! "$?" = "0" ]; then
 			echo "$mysqlsuccess"
-			unmount_drive
+			set_user_permissions
+			backup_unmount_drive
 			exit 964
 		fi
 		shred -zu /root/temp${1}data/${RESTORE_SUBDIR}/temp${1}data/*
 						rm -rf /etc/share/tt-rss
 						mv /root/temp${1}/etc/share/tt-rss /etc/share/
 						if [ ! "$?" = "0" ]; then
-							unmount_drive
+							set_user_permissions
+							backup_unmount_drive
 							exit 528
 						fi
 						if [ -d /etc/letsencrypt/live/${2} ]; then
 					rm -rf /var/www/${2}/htdocs
 					mv /root/temp${1}/${RESTORE_SUBDIR}/www/${2}/htdocs /var/www/${2}/
 					if [ ! "$?" = "0" ]; then
-						unmount_drive
+						set_user_permissions
+						backup_unmount_drive
 						exit 683
 					fi
 					if [ -d /etc/letsencrypt/live/${2} ]; then
 
 		cp -f /root/tempconfig/root/${PROJECT_NAME}.cfg $CONFIG_FILE
 		if [ ! "$?" = "0" ]; then
-			unmount_drive
+			set_user_permissions
+			backup_unmount_drive
 			rm -rf /root/tempconfig
 			exit 5294
 		fi
 
 		cp -f /root/tempconfig/root/${PROJECT_NAME}-completed.txt $COMPLETION_FILE
 		if [ ! "$?" = "0" ]; then
-			unmount_drive
+			set_user_permissions
+			backup_unmount_drive
 			rm -rf /root/tempconfig
 			exit 6382
 		fi
 		if [ -f /root/tempconfig${BACKUP_EXTRA_DIRECTORIES} ]; then
 			cp -f /root/tempconfig${BACKUP_EXTRA_DIRECTORIES} ${BACKUP_EXTRA_DIRECTORIES}
 			if [ ! "$?" = "0" ]; then
-				unmount_drive
+				set_user_permissions
+				backup_unmount_drive
 				rm -rf /root/tempconfig
 				exit 62121
 			fi
 	PREV_ADMIN_USERNAME=$(cat $COMPLETION_FILE | grep "Admin user" | awk -F ':' '{print $2}')
 	if [[ "$PREV_ADMIN_USERNAME" != "$ADMIN_USERNAME" ]]; then
 		echo $"The admin username has changed from $PREV_ADMIN_USERNAME to $ADMIN_USERNAME. To restore you will first need to install a new ${PROJECT_NAME} system with an initial admin user named $PREV_ADMIN_USERNAME"
-		unmount_drive
+		set_user_permissions
+		backup_unmount_drive
 		exit 73265
 	fi
 }
 			fi
 			if [ ! "$?" = "0" ]; then
 				echo "$mysqlsuccess"
-				unmount_drive
+				set_user_permissions
+				backup_unmount_drive
 				exit 962
 			fi
 			echo $"Restarting database"
 				fi
 				if [ ! "$?" = "0" ]; then
 					rm -rf /root/tempmutt
-					unmount_drive
+					set_user_permissions
+					backup_unmount_drive
 					exit 276
 				fi
 				rm -rf /root/tempmutt
 				cp -r /root/tempgnupg/home/$USERNAME/.gnupg /home/$USERNAME/
 				if [ ! "$?" = "0" ]; then
 					rm -rf /root/tempgnupg
-					unmount_drive
+					set_user_permissions
+					backup_unmount_drive
 					exit 276
 				fi
 				rm -rf /root/tempgnupg
 				if [[ "$USERNAME" == "$ADMIN_USERNAME" ]]; then
 					cp -r /home/$USERNAME/.gnupg /root
 					if [ ! "$?" = "0" ]; then
-						unmount_drive
+						set_user_permissions
+						backup_unmount_drive
 						exit 283
 					fi
 				fi
 				cp -f /root/tempprocmail/home/$USERNAME/tempbackup/.procmailrc /home/$USERNAME/
 				if [ ! "$?" = "0" ]; then
 					rm -rf /root/tempprocmail
-					unmount_drive
+					set_user_permissions
+					backup_unmount_drive
 					exit 276
 				fi
 				rm -rf /root/tempprocmail
 					cp -rf /root/tempspamassassin/home/$USERNAME/.spamassassin /home/$USERNAME/
 					if [ ! "$?" = "0" ]; then
 						rm -rf /root/tempspamassassin
-						unmount_drive
+						set_user_permissions
+						backup_unmount_drive
 						exit 276
 					fi
 					rm -rf /root/tempspamassassin
 		cp -f /root/tempreadme/home/$ADMIN_USERNAME/tempbackup/README /home/$ADMIN_USERNAME/
 		if [ ! "$?" = "0" ]; then
 			rm -rf /root/tempreadme
-			unmount_drive
+			set_user_permissions
+			backup_unmount_drive
 			exit 276
 		fi
 		rm -rf /root/tempreadme
 		cp -rf /root/tempipfs/home/$ADMIN_USERNAME/.ipfs/* /home/$ADMIN_USERNAME/.ipfs
 		if [ ! "$?" = "0" ]; then
 			rm -rf /root/tempipfs
-			unmount_drive
+			set_user_permissions
+			backup_unmount_drive
 			exit 276
 		fi
 		rm -rf /root/tempipfs
 				cp -r /root/tempssh/home/$USERNAME/.ssh /home/$USERNAME/
 				if [ ! "$?" = "0" ]; then
 					rm -rf /root/tempssh
-					unmount_drive
+					set_user_permissions
+					backup_unmount_drive
 					exit 664
 				fi
 				rm -rf /root/tempssh
 				cp -r /root/tempconfig/home/$USERNAME/.config /home/$USERNAME/
 				if [ ! "$?" = "0" ]; then
 					rm -rf /root/tempconfig
-					unmount_drive
+					set_user_permissions
+					backup_unmount_drive
 					exit 664
 				fi
 				rm -rf /root/tempconfig
 				cp -r /root/tempemacs/home/$USERNAME/.emacs.d /home/$USERNAME/
 				if [ ! "$?" = "0" ]; then
 					rm -rf /root/tempemacs
-					unmount_drive
+					set_user_permissions
+					backup_unmount_drive
 					exit 664
 				fi
 				cp -f /root/tempemacs/home/$USERNAME/.emacs.d/dotemacs /home/$USERNAME/.emacs
 				cp -r /root/tempmonkeysphere/home/$USERNAME/.monkeysphere /home/$USERNAME/
 				if [ ! "$?" = "0" ]; then
 					rm -rf /root/tempmonkeysphere
-					unmount_drive
+					set_user_permissions
+					backup_unmount_drive
 					exit 664
 				fi
 				rm -rf /root/tempmonkeysphere
 				cp -r /root/tempfin/home/$USERNAME/.fin /home/$USERNAME/
 				if [ ! "$?" = "0" ]; then
 					rm -rf /root/tempfin
-					unmount_drive
+					set_user_permissions
+					backup_unmount_drive
 					exit 664
 				fi
 				rm -rf /root/tempfin
 				cp -r /root/templocal/home/$USERNAME/.local /home/$USERNAME/
 				if [ ! "$?" = "0" ]; then
 					rm -rf /root/templocal
-					unmount_drive
+					set_user_permissions
+					backup_unmount_drive
 					exit 664
 				fi
 				rm -rf /root/templocal
 		restore_directory_from_usb /root/tempssl ssl
 		cp -r /root/tempssl/etc/ssl/* /etc/ssl
 		if [ ! "$?" = "0" ]; then
-			unmount_drive
+			set_user_permissions
+			backup_unmount_drive
 			exit 276
 		fi
 		rm -rf /root/tempssl
 					fi
 					mv /root/temppersonal/home/$USERNAME/personal /home/$USERNAME
 					if [ ! "$?" = "0" ]; then
-						unmount_drive
+						set_user_permissions
+						backup_unmount_drive
 						exit 184
 					fi
 					rm -rf /root/temppersonal
 		restore_directory_from_usb /root/tempmailinglist mailinglist
 		cp -r /root/tempmailinglist/root/spool/mlmmj/* /var/spool/mlmmj
 		if [ ! "$?" = "0" ]; then
-			unmount_drive
+			set_user_permissions
+			backup_unmount_drive
 			exit 526
 		fi
 		rm -rf /root/tempmailinglist
 		restore_directory_from_usb /root/tempxmpp xmpp
 		cp -r /root/tempxmpp/var/lib/prosody/* /var/lib/prosody
 		if [ ! "$?" = "0" ]; then
-			unmount_drive
+			set_user_permissions
+			backup_unmount_drive
 			exit 725
 		fi
 		rm -rf /root/tempxmpp
 		restore_directory_from_usb /root/tempsyncthingconfig syncthingconfig
 		cp -r /root/tempsyncthingconfig/* /
 		if [ ! "$?" = "0" ]; then
-			unmount_drive
+			set_user_permissions
+			backup_unmount_drive
 			systemctl start syncthing
 			systemctl start cron
 			exit 6833
 		restore_directory_from_usb /root/tempsyncthingshared syncthingshared
 		cp -r /root/tempsyncthingshared/* /
 		if [ ! "$?" = "0" ]; then
-			unmount_drive
+			set_user_permissions
+			backup_unmount_drive
 			systemctl start syncthing
 			systemctl start cron
 			exit 37904
 				cp -r /root/tempsyncthing/home/$USERNAME/Sync /home/$USERNAME/
 				if [ ! "$?" = "0" ]; then
 					rm -rf /root/tempsyncthing
-					unmount_drive
+					set_user_permissions
+					backup_unmount_drive
 					systemctl start syncthing
 					systemctl start cron
 					exit 68438
 		restore_directory_from_usb /root/tempmediagoblin mediagoblin
 		cp -r /root/tempmediagoblin/* /
 		if [ ! "$?" = "0" ]; then
-			unmount_drive
+			set_user_permissions
+			backup_unmount_drive
 			exit 67843
 		fi
 		rm -rf /root/tempmediagoblin
 			fi
 			cp -r /root/tempgogs/$GOPATH/src/github.com/gogits/gogs/custom/* $GOPATH/src/github.com/gogits/gogs/custom
 			if [ ! "$?" = "0" ]; then
-				unmount_drive
+				set_user_permissions
+				backup_unmount_drive
 				exit 981
 			fi
 			echo $"Restoring Gogs repos"
 			restore_directory_from_usb /root/tempgogsrepos gogsrepos
 			cp -r /root/tempgogsrepos/home/git/gogs-repositories/* /home/git/gogs-repositories/
 			if [ ! "$?" = "0" ]; then
-				unmount_drive
+				set_user_permissions
+				backup_unmount_drive
 				exit 67574
 			fi
 			echo $"Restoring Gogs authorized_keys"
 			fi
 			cp -r /root/tempgogsssh/home/git/.ssh/* /home/git/.ssh/
 			if [ ! "$?" = "0" ]; then
-				unmount_drive
+				set_user_permissions
+				backup_unmount_drive
 				exit 8463
 			fi
 			rm -rf /root/tempgogs
 		restore_directory_from_usb /root/tempwiki wiki
 		cp -r /root/tempwiki/var/lib/dokuwiki/* /var/lib/dokuwiki/
 		if [ ! "$?" = "0" ]; then
-			unmount_drive
+			set_user_permissions
+			backup_unmount_drive
 			exit 868
 		fi
 		restore_directory_from_usb /root/tempwiki2 wiki2
 		cp -r /root/tempwiki2/etc/dokuwiki/* /etc/dokuwiki/
 		if [ ! "$?" = "0" ]; then
-			unmount_drive
+			set_user_permissions
+			backup_unmount_drive
 			exit 869
 		fi
 		rm -rf /root/tempwiki
 		rm -rf /var/www/${FULLBLOG_DOMAIN_NAME}/htdocs
 		cp -r /root/tempblog/var/www/${FULLBLOG_DOMAIN_NAME}/htdocs /var/www/${FULLBLOG_DOMAIN_NAME}/
 		if [ ! "$?" = "0" ]; then
-			unmount_drive
+			set_user_permissions
+			backup_unmount_drive
 			exit 593
 		fi
 		rm -rf /root/tempblog
 		if [ ! -d /var/www/${FULLBLOG_DOMAIN_NAME}/htdocs/content ]; then
 			echo $"No content directory found after restoring blog"
-			unmount_drive
+			set_user_permissions
+			backup_unmount_drive
 			exit 287
 		fi
 		chown -R www-data:www-data /var/www/${FULLBLOG_DOMAIN_NAME}/htdocs
 		rm -rf /etc/cjdns
 		cp -r /root/tempcjdns/etc/cjdns /etc/
 		if [ ! "$?" = "0" ]; then
-			unmount_drive
+			set_user_permissions
+			backup_unmount_drive
 			exit 8472
 		fi
 		rm -rf /root/tempcjdns
 				fi
 				tar -xzvf /root/tempmail/root/tempbackupemail/$USERNAME/maildir.tar.gz -C /
 				if [ ! "$?" = "0" ]; then
-					unmount_drive
+					set_user_permissions
+					backup_unmount_drive
 					exit 927
 				fi
 				rm -rf /root/tempmail
 			cp -r /root/tempdlna/var/cache/minidlna/* /var/cache/minidlna/
 			if [ ! "$?" = "0" ]; then
 				rm -rf /root/tempdlna
-				unmount_drive
+				set_user_permissions
+				backup_unmount_drive
 				exit 982
 			fi
 			rm -rf /root/tempdlna
 		cp -f /root/tempvoip/home/$ADMIN_USERNAME/tempbackup/mumble-server.ini /etc/
 		if [ ! "$?" = "0" ]; then
 			rm -rf /root/tempvoip
-			unmount_drive
+			set_user_permissions
+			backup_unmount_drive
 			exit 3679
 		fi
 		cp -f /root/tempvoip/home/$ADMIN_USERNAME/tempbackup/sipwitch.conf /etc/sipwitch.conf
 		if [ ! "$?" = "0" ]; then
 			rm -rf /root/tempvoip
-			unmount_drive
+			set_user_permissions
+			backup_unmount_drive
 			exit 3679
 		fi
 		cp -f /root/tempvoip/home/$ADMIN_USERNAME/tempbackup/mumble-server.sqlite /var/lib/mumble-server/
 		if [ ! "$?" = "0" ]; then
 			rm -rf /root/tempvoip
-			unmount_drive
+			set_user_permissions
+			backup_unmount_drive
 			exit 276
 		fi
 		rm -rf /root/tempvoip
 		echo $"Restoring Tox node settings"
 		restore_directory_from_usb / tox
 		if [ ! "$?" = "0" ]; then
-			unmount_drive
+			set_user_permissions
+			backup_unmount_drive
 			exit 6393
 		fi
 		cp /var/lib/tox-bootstrapd/tox-bootstrapd.conf /etc/tox-bootstrapd.conf
 		systemctl restart tox-bootstrapd.service
 		if [ ! "$?" = "0" ]; then
 			systemctl status tox-bootstrapd.service
-			unmount_drive
+			set_user_permissions
+			backup_unmount_drive
 			exit 59369
 		fi
 	fi
 }
 
 get_restore_app ${2}
-mount_drive ${1} ${2}
+backup_mount_drive ${1} ${ADMIN_USERNAME} ${2}
 check_backup_exists
 check_admin_user
 copy_gpg_keys
 restore_dlna
 restore_voip
 restore_tox
-unmount_drive
+set_user_permissions
+backup_unmount_drive
 
 echo $"Restore from USB drive is complete. You can now unplug it."
 

src/freedombone-utils-backup

 	fi
 	ADMIN_NAME=$(getent passwd $ADMIN_USERNAME | cut -d: -f5 | cut -d, -f1)
 
+	if [ $3 ]; then
+		RESTORE_APP=$3
+	fi
+	
 	# check that the backup destination is available
 	if [ ! -b $USB_DRIVE ]; then
 		echo $"Please attach a USB drive"
 	sync
 	umount $USB_MOUNT
 	if [ ! "$?" = "0" ]; then
-		echo $"Unable to unmount the drive. This means that the backup did not work"
+		echo $"Unable to unmount the drive."
 		rm -rf $USB_MOUNT
 		exit 9
 	fi
 	if [ -f /dev/mapper/encrypted_usb ]; then
 		rm -rf /dev/mapper/encrypted_usb
 	fi
-	echo $"Backup to USB drive is complete. You can now unplug it."
 }
 
 function backup_database_local {