Half reverted GetCommandlineArguments placement

This commit is contained in:
deajan 2015-04-24 23:41:01 +02:00
parent d3985716d8
commit dfeccbdf43
1 changed files with 19 additions and 19 deletions

View File

@ -5,7 +5,7 @@
AUTHOR="(L) 2013-2015 by Orsiris \"Ozy\" de Jong" AUTHOR="(L) 2013-2015 by Orsiris \"Ozy\" de Jong"
CONTACT="http://www.netpower.fr/obackup - ozy@netpower.fr" CONTACT="http://www.netpower.fr/obackup - ozy@netpower.fr"
PROGRAM_VERSION=1.9pre PROGRAM_VERSION=1.9pre
PROGRAM_BUILD=2404201503 PROGRAM_BUILD=2404201504
## type doesn't work on platforms other than linux (bash). If if doesn't work, always assume output is not a zero exitcode ## 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 if ! type -p "$BASH" > /dev/null
@ -1459,8 +1459,6 @@ function Usage
exit 128 exit 128
} }
function GetCommandlineArguments
{
# Command line argument flags # Command line argument flags
dryrun=0 dryrun=0
silent=0 silent=0
@ -1478,6 +1476,8 @@ function GetCommandlineArguments
soft_alert_total=0 soft_alert_total=0
error_alert=0 error_alert=0
function GetCommandlineArguments
{
if [ $# -eq 0 ] if [ $# -eq 0 ]
then then
Usage Usage
@ -1517,6 +1517,7 @@ function GetCommandlineArguments
done done
} }
GetCommandlineArguments "$@"
CheckEnvironment CheckEnvironment
if [ $? == 0 ] if [ $? == 0 ]
then then
@ -1536,7 +1537,6 @@ then
else else
LOG_FILE="$LOGFILE" LOG_FILE="$LOGFILE"
fi fi
GetCommandlineArguments "$@"
GetLocalOS GetLocalOS
InitLocalOSSettings InitLocalOSSettings