From b0f67a359870e3154e33ff7b9b6ed714de54e461 Mon Sep 17 00:00:00 2001
From: Javi Fontan <jfontan@opennebula.org>
Date: Tue, 26 Apr 2016 15:44:30 +0200
Subject: [PATCH] bug #4366: preserve line breaks in monitor_and_log

---
 src/mad/sh/scripts_common.sh | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/mad/sh/scripts_common.sh b/src/mad/sh/scripts_common.sh
index 4135b69320..9816d56988 100644
--- a/src/mad/sh/scripts_common.sh
+++ b/src/mad/sh/scripts_common.sh
@@ -157,12 +157,13 @@ function exec_and_log
 # the command fails
 function monitor_and_log
 {
-    EXEC_OUT=`bash -s 2>/dev/null <<EOF
+    EXEC_OUT="$(bash -s 2>/dev/null <<EOF
 export LANG=C
 export LC_ALL=C
 set -xv
 $1
-EOF`
+EOF
+)"
     EXEC_RC=$?
 
     if [ $EXEC_RC -ne 0 ]; then
@@ -176,7 +177,7 @@ EOF`
         exit $EXEC_RC
     fi
 
-    echo $EXEC_OUT
+    echo "$EXEC_OUT"
 }
 
 # Executes a command, if it fails returns error message and exits. Similar to
@@ -410,11 +411,12 @@ EOF`
 # the command fails
 function ssh_monitor_and_log
 {
-    SSH_EXEC_OUT=`$SSH $1 sh -s 2>/dev/null <<EOF
+    SSH_EXEC_OUT="$($SSH $1 sh -s 2>/dev/null <<EOF
 export LANG=C
 export LC_ALL=C
 $2
-EOF`
+EOF
+)"
     SSH_EXEC_RC=$?
 
     if [ $SSH_EXEC_RC -ne 0 ]; then
@@ -428,7 +430,7 @@ EOF`
         exit $SSH_EXEC_RC
     fi
 
-    echo $SSH_EXEC_OUT
+    echo "$SSH_EXEC_OUT"
 }
 
 #Creates path ($2) at $1