From 941f8bb749a6c9ac856bf5da817c48f98c550af6 Mon Sep 17 00:00:00 2001
From: deajan <ozy@badministrateur.com>
Date: Sat, 16 Nov 2013 13:12:25 +0100
Subject: [PATCH] mino bugfixes

---
 CHANGELOG.md | 1 +
 osync.sh     | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 89d3b26..22a8f27 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@ KNOWN ISSUES
 RECENT CHANGES
 --------------
 
+- Improved execution hooks logs
 - Various bugfixes introduced with function merge
 - Added basic MacOS X support (yet not fully tested)
 - Merged tree list functions into one
diff --git a/osync.sh b/osync.sh
index 58a837a..d970a59 100755
--- a/osync.sh
+++ b/osync.sh
@@ -3,7 +3,7 @@
 ###### Osync - Rsync based two way sync engine with fault tolerance
 ###### (L) 2013 by Orsiris "Ozy" de Jong (www.netpower.fr) 
 OSYNC_VERSION=0.99RC2
-OSYNC_BUILD=1411201302
+OSYNC_BUILD=1611201301
 
 DEBUG=no
 SCRIPT_PID=$$
@@ -465,7 +465,7 @@ function RunLocalCommand
                 LogError "Command failed."
         fi
 
-	if [ $verbose -eq 1 ]
+	if [ $verbose -eq 1 ] || [ $retval -ne 0 ]
 	then
         	Log "Command output:\n$(cat $RUN_DIR/osync_run_local_$SCRIPT_PID)"
 	fi
@@ -498,7 +498,7 @@ function RunRemoteCommand
                 LogError "Command failed."
         fi
 
-        if [ -f $RUN_DIR/osync_run_remote_$SCRIPT_PID ] && [ $verbose -eq 1 ]
+        if [ -f $RUN_DIR/osync_run_remote_$SCRIPT_PID ] && ([ $verbose -eq 1 ] || [ $retval -ne 0 ])
         then
                 Log "Command output:\n$(cat $RUN_DIR/osync_run_remote_$SCRIPT_PID)"
         fi