From 8563ff52fb52d186de20ebb7840fb9964b009893 Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Wed, 8 Jan 2020 19:36:15 +0100 Subject: [PATCH] minor updates in make_deb_pacakge.sh --- pandora_agents/unix/DEBIAN/make_deb_package.sh | 9 +++++++-- pandora_server/DEBIAN/make_deb_package.sh | 14 ++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh index a1b4728047..fd53917767 100644 --- a/pandora_agents/unix/DEBIAN/make_deb_package.sh +++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh @@ -20,8 +20,13 @@ echo "Test if you has the tools for to make the packages." 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 + + # Use dockerized app. + alias dpkg-deb="eval $DPKG_DEB" else echo "Found \"dpkg-debs\"." fi diff --git a/pandora_server/DEBIAN/make_deb_package.sh b/pandora_server/DEBIAN/make_deb_package.sh index 967016a063..25b3dd6de0 100644 --- a/pandora_server/DEBIAN/make_deb_package.sh +++ b/pandora_server/DEBIAN/make_deb_package.sh @@ -64,6 +64,20 @@ mkdir temp_package if [ $package_pandora -eq 1 ] then + whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null + if [ $? = 1 ] + then + if [ "$DPKG_DEB" == "" ]; then + echo "No found \"dpkg-deb\" aplication, please install." + exit 1 + fi + + # Use dockerized app. + alias dpkg-deb="eval $DPKG_DEB" + else + echo "Found \"dpkg-debs\"." + fi + mkdir -p temp_package/usr/bin/ mkdir -p temp_package/usr/sbin/ mkdir -p temp_package/etc/init.d/