From 93380430efb7ea6b3ff65b182fb5d0db9c6b65ff Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Wed, 8 Jan 2020 19:45:50 +0100
Subject: [PATCH] alternative dpkg-deb

---
 .../unix/DEBIAN/make_deb_package.sh           | 11 ++++---
 pandora_console/DEBIAN/make_deb_package.sh    | 33 ++++++++++++-------
 pandora_server/DEBIAN/make_deb_package.sh     |  8 +++--
 3 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh
index b14393bee8..16ff045cf9 100644
--- a/pandora_agents/unix/DEBIAN/make_deb_package.sh
+++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh
@@ -27,8 +27,7 @@ then
 
 	echo ">> Using dockerized version of dpkg-deb: "
 	echo "  $DPKG_DEB"
-	# Use dockerized app.
-	alias dpkg-deb="eval $DPKG_DEB"
+	USE_DOCKER_APP=1
 else
 	echo "Found \"dpkg-debs\"."
 fi
@@ -129,8 +128,12 @@ do
 done
 echo "END"
 
-echo "Make the package \"Pandorafms console\"."
-dpkg-deb --build temp_package
+echo "Make the package \"Pandorafms agent\"."
+if [ "$USE_DOCKER_APP" == "1" ]; then 
+	eval $DPKG_DEB --build temp_package
+else
+	dpkg-deb --build temp_package
+fi
 mv temp_package.deb pandorafms.agent_unix_$pandora_version.deb
 
 echo "Delete the \"temp_package\" temp dir for job."
diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh
index be3de30f74..52a2658754 100644
--- a/pandora_console/DEBIAN/make_deb_package.sh
+++ b/pandora_console/DEBIAN/make_deb_package.sh
@@ -44,8 +44,15 @@ then
 	whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null
 	if [ $? = 1 ]
 	then
-		echo "No found \"dpkg-deb\" aplication, please install."
-		exit 1
+		if [ "$DPKG_DEB" == "" ]; then
+			echo "No found \"dpkg-deb\" aplication, please install."
+			exit 1
+		fi
+
+		echo ">> Using dockerized version of dpkg-deb: "
+		echo "  $DPKG_DEB"
+		# Use dockerized app.
+		USE_DOCKER_APP=1
 	else
 		echo "Found \"dpkg-debs\"."
 	fi
@@ -70,15 +77,15 @@ then
 	else
 		echo "Found \"fakeroot\"."
 	fi
-fi
 
-whereis dpkg-buildpackage | cut -d":" -f2 | grep dpkg-buildpackage > /dev/null
-if [ $? = 1 ]
-then
-	echo " \"dpkg-buildpackage\" aplication not found, please install."
-	exit 1
-else
-	echo "Found \"dpkg-buildpackage\"."
+	whereis dpkg-buildpackage | cut -d":" -f2 | grep dpkg-buildpackage > /dev/null
+	if [ $? = 1 ]
+	then
+		echo " \"dpkg-buildpackage\" aplication not found, please install."
+		exit 1
+	else
+		echo "Found \"dpkg-buildpackage\"."
+	fi
 fi
 
 cd ..
@@ -141,7 +148,11 @@ then
 	echo "END"
 
 	echo "Make the package \"Pandorafms console\"."
-	dpkg-deb --build temp_package
+	if [ "$USE_DOCKER_APP" == "1" ]; then 
+		eval $DPKG_DEB --build temp_package
+	else
+		dpkg-deb --build temp_package
+	fi
 	mv temp_package.deb pandorafms.console_$pandora_version.deb
 fi
 
diff --git a/pandora_server/DEBIAN/make_deb_package.sh b/pandora_server/DEBIAN/make_deb_package.sh
index 7cc77a0d33..99799817a7 100644
--- a/pandora_server/DEBIAN/make_deb_package.sh
+++ b/pandora_server/DEBIAN/make_deb_package.sh
@@ -75,7 +75,7 @@ then
 		echo ">> Using dockerized version of dpkg-deb: "
 		echo "  $DPKG_DEB"
 		# Use dockerized app.
-		alias dpkg-deb="eval $DPKG_DEB"
+		USE_DOCKER_APP=1
 	else
 		echo "Found \"dpkg-debs\"."
 	fi
@@ -180,7 +180,11 @@ then
 	echo "END"
 
 	echo "Make the package \"Pandorafms server\"."
-	dpkg-deb --build temp_package
+	if [ "$USE_DOCKER_APP" == "1" ]; then 
+		eval $DPKG_DEB --build temp_package
+	else
+		dpkg-deb --build temp_package
+	fi
 	mv temp_package.deb pandorafms.server_$pandora_version.deb
 	chmod 777 pandorafms.server_$pandora_version.deb
 fi