From 039e0579154a7384c4b8e7995c51874f0fa7969d Mon Sep 17 00:00:00 2001
From: deajan <ozy@netpower.fr>
Date: Sun, 4 Dec 2016 11:17:51 +0100
Subject: [PATCH] Some minor improvements ported from osync

---
 dev/n_obackup.sh | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/dev/n_obackup.sh b/dev/n_obackup.sh
index 9cc10ad..34a1c80 100755
--- a/dev/n_obackup.sh
+++ b/dev/n_obackup.sh
@@ -9,7 +9,7 @@ PROGRAM="obackup"
 AUTHOR="(C) 2013-2016 by Orsiris de Jong"
 CONTACT="http://www.netpower.fr/obackup - ozy@netpower.fr"
 PROGRAM_VERSION=2.1-dev
-PROGRAM_BUILD=2016113001
+PROGRAM_BUILD=2016120401
 IS_STABLE=no
 
 source "./ofunctions.sh"
@@ -68,7 +68,7 @@ function TrapQuit {
 		exitcode=2
 	else
 		RunAfterHook
-		Logger "$PROGRAM finshed without errors." "NOTICE"
+		Logger "$PROGRAM finshed." "ALWAYS"
 		exitcode=0
 	fi
 
@@ -1707,24 +1707,20 @@ fi
 
 DATE=$(date)
 Logger "--------------------------------------------------------------------" "NOTICE"
-Logger "$DRY_WARNING$DATE - $PROGRAM v$PROGRAM_VERSION $BACKUP_TYPE script begin." "NOTICE"
+Logger "$DRY_WARNING$DATE - $PROGRAM v$PROGRAM_VERSION $BACKUP_TYPE script begin." "ALWAYS"
 Logger "--------------------------------------------------------------------" "NOTICE"
 Logger "Backup instance [$INSTANCE_ID] launched as $LOCAL_USER@$LOCAL_HOST (PID $SCRIPT_PID)" "NOTICE"
 
 GetLocalOS
-InitLocalOSSettings
+InitLocalOSDependingSettings
 CheckRunningInstances
 PreInit
 Init
 CheckEnvironment
 PostInit
 CheckCurrentConfig
-
-if [ "$REMOTE_OPERATION" == "yes" ]; then
-	GetRemoteOS
-	InitRemoteOSSettings
-fi
-InitRsyncSettings
+GetRemoteOS
+InitRemoteOSDependingSettings
 
 if [ $no_maxtime == true ]; then
 	SOFT_MAX_EXEC_TIME_DB_TASK=0