From 5b7b9b0e28c302cb5c72903a0fd35449f551fc41 Mon Sep 17 00:00:00 2001 From: deajan Date: Sun, 26 Apr 2015 22:28:56 +0200 Subject: [PATCH] Improved obackup-batch.sh for crontab execution --- CHANGELOG.md | 1 + obackup-batch.sh | 34 ++++++++++++++++++++++------------ 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f1ca514..994573b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,7 @@ UNDER WORK CHANGELOG --------- +- Added detection of obackup.sh script in obackup-batch.sh to overcome mising path in crontab - 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 diff --git a/obackup-batch.sh b/obackup-batch.sh index 543a3df..d877fc0 100755 --- a/obackup-batch.sh +++ b/obackup-batch.sh @@ -3,7 +3,7 @@ PROGRAM="Obackup-batch" # Batch program to run obackup instances sequentially and rerun failed ones AUTHOR="(L) 2013-2014 by Orsiris \"Ozy\" de Jong" CONTACT="http://www.netpower.fr/obackup - ozy@netpower.fr" -PROGRAM_BUILD=2404201501 +PROGRAM_BUILD=2504201501 ## Runs an obackup instance for every conf file found ## If an instance fails, run it again if time permits @@ -17,15 +17,6 @@ MAX_EXECUTION_TIME=36000 ## Specifies the number of reruns an instance may get MAX_RERUNS=3 - -## Obackup executable full path can be set here if it cannot be found on the system -if ! type -p obackup.sh > /dev/null 2>&1 -then - OBACKUP_EXECUTABLE=./obackup.sh -else - OBACKUP_EXECUTABLE=$(type -p obackup.sh) -fi - ## Log file path if [ -w /var/log ] then @@ -47,6 +38,25 @@ function Log fi } +function CheckEnvironment +{ + ## Obackup executable full path can be set here if it cannot be found on the system + if ! type -p obackup.sh > /dev/null 2>&1 + then + if [ -f /usr/local/bin/obackup.sh ] + then + OBACKUP_EXECUTABLE=/usr/local/bin/obackup.sh + elif [ -f ./obackup.sh ] + then + OBACKUP_EXECUTABLE=./obackup.sh + else + Log "Could not find obackup.sh" + exit 1 + fi + else + OBACKUP_EXECUTABLE=$(type -p obackup.sh) + fi +} function Batch { @@ -77,8 +87,7 @@ function Batch else RUN_AGAIN=$RUN_AGAIN" $i" fi - elif [ $verbose -eq 1 ] - then + else Log "Run instance $(basename $i) succeed." fi done @@ -145,5 +154,6 @@ do esac done +CheckEnvironment Log "$(date) Obackup batch run" Batch