From a4312e31fd5d0b3c32d4c0a9897d7c22ff13178e Mon Sep 17 00:00:00 2001 From: deajan Date: Wed, 19 Oct 2016 12:45:10 +0200 Subject: [PATCH] Rebuilt targets --- dev/debug_osync.sh | 4 ++-- osync.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dev/debug_osync.sh b/dev/debug_osync.sh index 79424c3..12f282a 100755 --- a/dev/debug_osync.sh +++ b/dev/debug_osync.sh @@ -4,7 +4,7 @@ PROGRAM="osync" # Rsync based two way sync engine with fault tolerance AUTHOR="(C) 2013-2016 by Orsiris de Jong" CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr" PROGRAM_VERSION=1.2-beta2 -PROGRAM_BUILD=2016101701 +PROGRAM_BUILD=2016101702 IS_STABLE=no # Execution order #__WITH_PARANOIA_DEBUG @@ -1645,7 +1645,7 @@ function CheckEnvironment { exit 1 fi - if ! type sshpass > /dev/null 2>&1 ; then + if [ "$SSH_PASSWORD_FILE" != "" ] && ! type sshpass > /dev/null 2>&1 ; then Logger "sshpass not present. Cannot use password authentication." "CRITICAL" exit 1 fi diff --git a/osync.sh b/osync.sh index bc6ddea..4c619a5 100755 --- a/osync.sh +++ b/osync.sh @@ -4,7 +4,7 @@ PROGRAM="osync" # Rsync based two way sync engine with fault tolerance AUTHOR="(C) 2013-2016 by Orsiris de Jong" CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr" PROGRAM_VERSION=1.2-beta2 -PROGRAM_BUILD=2016101701 +PROGRAM_BUILD=2016101702 IS_STABLE=no @@ -1514,7 +1514,7 @@ function CheckEnvironment { exit 1 fi - if ! type sshpass > /dev/null 2>&1 ; then + if [ "$SSH_PASSWORD_FILE" != "" ] && ! type sshpass > /dev/null 2>&1 ; then Logger "sshpass not present. Cannot use password authentication." "CRITICAL" exit 1 fi