From 00342e610b079d9b2116ac0f57312a23fd27d32f Mon Sep 17 00:00:00 2001 From: deajan Date: Fri, 24 Apr 2015 21:13:48 +0200 Subject: [PATCH] Quick fix for osync-batch.sh --- CHANGELOG.md | 1 + osync-batch.sh | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bad6427..45629c3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,6 +31,7 @@ UNDER WORK RECENT CHANGES -------------- +- Fixed osync-batch.sh script when osync is in executable path like /usr/local/bin - Fixed multiple keep logging messages since sleep time between commands has been lowered under a second - Added optional checksum parameter for the paranoid :) - Fixed typo in soft deletion code preventing logging slave deleted backup files diff --git a/osync-batch.sh b/osync-batch.sh index 0c83ee3..7bcb7b1 100755 --- a/osync-batch.sh +++ b/osync-batch.sh @@ -3,7 +3,7 @@ PROGRAM="Osync-batch" # Batch program to run osync instances sequentially and rerun failed ones AUTHOR="(L) 2013-2014 by Orsiris \"Ozy\" de Jong" CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr" -PROGRAM_BUILD=0104201502 +PROGRAM_BUILD=2404201501 ## Runs an osync instance for every conf file found ## If an instance fails, run it again if time permits @@ -22,6 +22,8 @@ MAX_RERUNS=3 if ! type -p osync.sh > /dev/null 2>&1 then OSYNC_EXECUTABLE=./osync.sh +else + OSYNC_EXECUTABLE=$(type -p osync.sh) fi ## Log file path