From 7e9d3d7fa6883bfa0a1bd6b04145d750d5fcdf55 Mon Sep 17 00:00:00 2001
From: dpuzyrkov <dpuzyrkov@termt.com>
Date: Mon, 16 May 2022 13:28:03 +0300
Subject: [PATCH] [*] install deps after variables export.
---
linux/debian/scripts/pre-build.sh | 7 ++++---
linux/ubuntu/scripts/pre-build.sh | 4 +++-
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/linux/debian/scripts/pre-build.sh b/linux/debian/scripts/pre-build.sh
index 2f3ffce..3de5a30 100755
--- a/linux/debian/scripts/pre-build.sh
+++ b/linux/debian/scripts/pre-build.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-
+.
#installing required dependencies
check_packages() {
@@ -10,7 +10,7 @@ check_packages() {
local PKG_DEPPIES=$(echo $PKG_DEPS | sed 's/\"//g')
echo "[DBG] PKG_DEPS: $PKG_DEPPIES"
-
+
for element in "$PKG_DEPPIES"; do
echo "[DEBUGGA] Checking if $element is installed"
if ! dpkg-query -s $element; then
@@ -43,13 +43,14 @@ install_dependencies() {
}
-install_dependencies
#. prod_build/general/install_dependencies
. prod_build/general/pre-build.sh #VERSIONS and git
export_variables "prod_build/general/conf/*"
export_variables "prod_build/linux/debian/conf/*"
+install_dependencies
+
VERSION_STRING=$(echo $VERSION_FORMAT | sed "s/\"//g" ) #Removing quotes
VERSION_ENTRIES=$(echo $VERSION_ENTRIES | sed "s/\"//g" )
extract_version_number
diff --git a/linux/ubuntu/scripts/pre-build.sh b/linux/ubuntu/scripts/pre-build.sh
index 6bafa1a..e15f48c 100755
--- a/linux/ubuntu/scripts/pre-build.sh
+++ b/linux/ubuntu/scripts/pre-build.sh
@@ -69,13 +69,15 @@ install_dependencies() {
#
#}
-install_dependencies
#. prod_build/general/install_dependencies
. prod_build/general/pre-build.sh #VERSIONS and git
export_variables "prod_build/general/conf/*"
export_variables "prod_build/linux/ubuntu/conf/*"
+install_dependencies
+
+
VERSION_STRING=$(echo $VERSION_FORMAT | sed "s/\"//g" ) #Removing quotes
VERSION_ENTRIES=$(echo $VERSION_ENTRIES | sed "s/\"//g" )
extract_version_number
--
GitLab