Make calling database backup to usb simpler

src/freedombone-app-gogs

@@ -56,11 +56,10 @@ function backup_local_gogs {
 
 			echo $"Backing up gogs"
 
-			function_check backup_database_local
-			backup_database_local gogs
+			function_check backup_database_to_usb
+			backup_database_to_usb gogs
 
 			function_check backup_directory_to_usb
-			backup_directory_to_usb /root/tempgogsdata gogsdata
 			backup_directory_to_usb $GOPATH/src/github.com/gogits/gogs/custom gogs
 			backup_directory_to_usb /home/git/gogs-repositories gogsrepos
 			backup_directory_to_usb /home/git/.ssh gogsssh

src/freedombone-app-hubzilla

@@ -66,11 +66,9 @@ function backup_local_hubzilla {
 			HUBZILLA_DOMAIN_NAME='hubzilla'
 			HUBZILLA_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "Hubzilla domain" | awk -F ':' '{print $2}')
 
-			function_check backup_database_local
-			backup_database_local hubzilla
+			function_check backup_database_to_usb
+			backup_database_to_usb hubzilla
 
-			function_check backup_directory_to_usb
-			backup_directory_to_usb /root/temphubzilladata hubzilladata
 			backup_directory_to_usb /var/www/${HUBZILLA_DOMAIN_NAME}/htdocs hubzilla
 
 			echo $"Hubzilla backup complete"

src/freedombone-app-rss

@@ -87,11 +87,9 @@ function backup_local_rss {
 
 			echo $"Backing up ttrss"
 
-			function_check backup_database_local
-			backup_database_local ttrss
+			function_check backup_database_to_usb
+			backup_database_to_usb ttrss
 
-			function_check backup_directory_to_usb
-			backup_directory_to_usb /root/tempttrssdata ttrssdata
 			backup_directory_to_usb /etc/share/tt-rss ttrss
 
 			echo $"ttrss backup complete"

src/freedombone-app-searx

@@ -64,11 +64,11 @@ function upgrade_searx {
 }
 
 function backup_local_searx {
-	echo ''
+	echo -n ''
 }
 
 function backup_remote_searx {
-	echo ''
+	echo -n ''
 }
 
 function remove_searx {

src/freedombone-app-sip

@@ -38,15 +38,15 @@ VOIP_TURN_TLS_PORT=5349
 VOIP_TURN_NONCE=
 
 function upgrade_sip {
-    echo ''
+    echo -n ''
 }
 
 function backup_local_sip {
-	echo ''
+	echo -n ''
 }
 
 function backup_remote_sip {
-	echo ''
+	echo -n ''
 }
 
 function remove_sip {

src/freedombone-app-syncthing

@@ -40,15 +40,15 @@ SYNCTHING_SHARED_DATA=/var/lib/syncthing/SyncShared
 SYNCTHING_USER_IDS_FILE='.syncthingids'
 
 function upgrade_syncthing {
-    echo ''
+    echo -n ''
 }
 
 function backup_local_syncthing {
-    echo ''
+    echo -n ''
 }
 
 function backup_remote_syncthing {
-    echo ''
+    echo -n ''
 }
 
 function remove_syncthing {

src/freedombone-utils-backup

@@ -261,4 +261,10 @@ function backup_directory_to_usb {
 	fi
 }
 
+function backup_database_to_usb {
+	database_name=$1
+	backup_database_local $database_name
+	backup_directory_to_usb /root/temp${database_name}data ${database_name}data
+}
+
 # NOTE: deliberately no exit 0