From 177321a9de362313f408f7f7dda8e64c03a8b43a Mon Sep 17 00:00:00 2001
From: deajan <ozy@netpower.fr>
Date: Thu, 10 Nov 2016 16:25:00 +0100
Subject: [PATCH] Fixes from osync

---
 dev/ofunctions.sh | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/dev/ofunctions.sh b/dev/ofunctions.sh
index c2e6309..29ff9de 100644
--- a/dev/ofunctions.sh
+++ b/dev/ofunctions.sh
@@ -1,6 +1,6 @@
 #### MINIMAL-FUNCTION-SET BEGIN ####
 
-## FUNC_BUILD=2016102314
+## FUNC_BUILD=2016111002
 ## BEGIN Generic bash functions written in 2013-2016 by Orsiris de Jong - http://www.netpower.fr - ozy@netpower.fr
 
 ## To use in a program, define the following variables:
@@ -85,7 +85,7 @@ fi
 
 
 # Default alert attachment filename
-ALERT_LOG_FILE="$RUN_DIR/$PROGRAM.last.log"
+ALERT_LOG_FILE="$RUN_DIR/$PROGRAM.$SCRIPT_PID.last.log"
 
 # Set error exit code if a piped command fails
 	set -o pipefail
@@ -424,7 +424,7 @@ function SendAlert {
 
 	# Delete tmp log file
 	if [ -f "$ALERT_LOG_FILE" ]; then
-		rm "$ALERT_LOG_FILE"
+		rm -f "$ALERT_LOG_FILE"
 	fi
 }
 
@@ -459,7 +459,7 @@ function SendEmail {
 	local auth_string=
 
 	if [ ! -f "$attachment" ]; then
-		attachment_command="-a $ALERT_LOG_FILE"
+		attachment_command="-a $attachment"
 		mail_no_attachment=1
 	else
 		mail_no_attachment=0
@@ -1026,7 +1026,9 @@ function GetLocalOS {
 
 	local localOsVar
 
-	if type busybox > /dev/null 2>&1; then
+	# There's no good way to tell if currently running in BusyBox shell. Using sluggish way.
+	ls --help 2>&1 | grep -i BusyBox > /dev/null
+	if [ $? == 0 ]; then
 		localOsVar="BusyBox"
 	else
 		localOsVar="$(uname -spio 2>&1)"
@@ -1079,7 +1081,7 @@ function GetRemoteOS {
 		CheckConnectivity3rdPartyHosts
 		CheckConnectivityRemoteHost
 
-		cmd=$SSH_CMD' "type busybox" > /dev/null 2>&1'
+		cmd=$SSH_CMD' "ls --help 2>&1 | grep -i BusyBox > /dev/null"'
 		Logger "cmd: $cmd" "DEBUG"
 		eval "$cmd" &
 		WaitForTaskCompletion $! 120 240 ${FUNCNAME[0]}"-0" true $KEEP_LOGGING