Moved command line args after config file for overriding

CHANGELOG.md

@@ -22,6 +22,7 @@ UNDER WORK
 CHANGELOG
 ---------
 
+- Moved command line arguments after config file load for allowing command line overrides
 - Added a config file option equivalent to --dontgetsize
 - Added basic install script from osync project
 - Added obackup-batch.sh from osync project to rerun failed backups in row

obackup.sh

@@ -5,7 +5,7 @@
 AUTHOR="(L) 2013-2015 by Orsiris \"Ozy\" de Jong"
 CONTACT="http://www.netpower.fr/obackup - ozy@netpower.fr"
 PROGRAM_VERSION=1.9pre
-PROGRAM_BUILD=2404201502
+PROGRAM_BUILD=2404201503
 
 ## type doesn't work on platforms other than linux (bash). If if doesn't work, always assume output is not a zero exitcode
 if ! type -p "$BASH" > /dev/null
@@ -1396,7 +1396,7 @@ function Main
 	if [ "$BACKUP_FILES" != "no" ]
 	then
 		ListDirectories
-		if [ "$dontgetsize" -ne 1 ] || [ "$DONT_GET_BACKUP_FILE_SIZE" == "no" ]
+		if [ "$DISABLE_GET_BACKUP_FILE_SIZE" != "yes" ]
 		then
 			GetDirectoriesSize
 		fi
@@ -1406,10 +1406,7 @@ function Main
 		CreateLocalStorageDirectories
 	fi
 
-	if [ "$dontgetsize" -ne 1  ]
+	CheckSpaceRequirements
-	then
-		CheckSpaceRequirements
-	fi
 
 	# Actual backup process
 	if [ "$BACKUP_SQL" != "no" ]
@@ -1462,60 +1459,63 @@ function Usage
 	exit 128
 }
 
-# Command line argument flags
+function GetCommandlineArguments
-dryrun=0
+{
-silent=0
+	# Command line argument flags
-no_maxtime=0
+	dryrun=0
-if [ "$DEBUG" == "yes" ]
+	silent=0
-then
+	no_maxtime=0
-	verbose=1
+	if [ "$DEBUG" == "yes" ]
-else
+	then
-	verbose=0
-fi
-dontgetsize=0
-stats=0
-PARTIAL=0
-# Alert flags
-soft_alert_total=0
-error_alert=0
-
-if [ $# -eq 0 ]
-then
-	Usage
-fi
-
-for i in "$@"
-do
-	case $i in
-		--dry)
-		dryrun=1
-		;;
-		--silent)
-		silent=1
-		;;
-		--verbose)
 		verbose=1
-		;;
+	else
-		--stats)
+		verbose=0
-		stats=1
+	fi
-		;;
+	dontgetsize=0
-		--partial)
+	stats=0
-		PARTIAL="yes"
+	PARTIAL=0
-		;;
+	# Alert flags
-		--no-maxtime)
+	soft_alert_total=0
-		no_maxtime=1
+	error_alert=0
-		;;
+
-		--delete)
+	if [ $# -eq 0 ]
-		DELETE_VANISHED_FILES="yes"
+	then
-		;;
-		--dontgetsize)
-		dontgetsize=1
-		;;
-		--help|-h|--version|-v)
 		Usage
-		;;
+	fi
-	esac
+
-done
+	for i in "$@"
+	do
+		case $i in
+			--dry)
+			dryrun=1
+			;;
+			--silent)
+			silent=1
+			;;
+			--verbose)
+			verbose=1
+			;;
+			--stats)
+			stats=1
+			;;
+			--partial)
+			PARTIAL="yes"
+			;;
+			--no-maxtime)
+			no_maxtime=1
+			;;
+			--delete)
+			DELETE_VANISHED_FILES="yes"
+			;;
+			--dontgetsize)
+			DISABLE_GET_BACKUP_FILE_SIZE="yes"
+			;;
+			--help|-h|--version|-v)
+			Usage
+			;;
+		esac
+	done
+}
 
 CheckEnvironment
 if [ $? == 0 ]
@@ -1536,6 +1536,7 @@ then
 			else
 				LOG_FILE="$LOGFILE"
 			fi
+			GetCommandlineArguments "$@"
 
 			GetLocalOS
 			InitLocalOSSettings