Skip to content
Snippets Groups Projects
Commit 7e9d3d7f authored by dpuzyrkov's avatar dpuzyrkov
Browse files

[*] install deps after variables export.

parent 3e6307dd
No related branches found
No related tags found
No related merge requests found
#!/bin/bash #!/bin/bash
.
#installing required dependencies #installing required dependencies
check_packages() { check_packages() {
...@@ -10,7 +10,7 @@ check_packages() { ...@@ -10,7 +10,7 @@ check_packages() {
local PKG_DEPPIES=$(echo $PKG_DEPS | sed 's/\"//g') local PKG_DEPPIES=$(echo $PKG_DEPS | sed 's/\"//g')
echo "[DBG] PKG_DEPS: $PKG_DEPPIES" echo "[DBG] PKG_DEPS: $PKG_DEPPIES"
for element in "$PKG_DEPPIES"; do for element in "$PKG_DEPPIES"; do
echo "[DEBUGGA] Checking if $element is installed" echo "[DEBUGGA] Checking if $element is installed"
if ! dpkg-query -s $element; then if ! dpkg-query -s $element; then
...@@ -43,13 +43,14 @@ install_dependencies() { ...@@ -43,13 +43,14 @@ install_dependencies() {
} }
install_dependencies
#. prod_build/general/install_dependencies #. prod_build/general/install_dependencies
. prod_build/general/pre-build.sh #VERSIONS and git . prod_build/general/pre-build.sh #VERSIONS and git
export_variables "prod_build/general/conf/*" export_variables "prod_build/general/conf/*"
export_variables "prod_build/linux/debian/conf/*" export_variables "prod_build/linux/debian/conf/*"
install_dependencies
VERSION_STRING=$(echo $VERSION_FORMAT | sed "s/\"//g" ) #Removing quotes VERSION_STRING=$(echo $VERSION_FORMAT | sed "s/\"//g" ) #Removing quotes
VERSION_ENTRIES=$(echo $VERSION_ENTRIES | sed "s/\"//g" ) VERSION_ENTRIES=$(echo $VERSION_ENTRIES | sed "s/\"//g" )
extract_version_number extract_version_number
......
...@@ -69,13 +69,15 @@ install_dependencies() { ...@@ -69,13 +69,15 @@ install_dependencies() {
# #
#} #}
install_dependencies
#. prod_build/general/install_dependencies #. prod_build/general/install_dependencies
. prod_build/general/pre-build.sh #VERSIONS and git . prod_build/general/pre-build.sh #VERSIONS and git
export_variables "prod_build/general/conf/*" export_variables "prod_build/general/conf/*"
export_variables "prod_build/linux/ubuntu/conf/*" export_variables "prod_build/linux/ubuntu/conf/*"
install_dependencies
VERSION_STRING=$(echo $VERSION_FORMAT | sed "s/\"//g" ) #Removing quotes VERSION_STRING=$(echo $VERSION_FORMAT | sed "s/\"//g" ) #Removing quotes
VERSION_ENTRIES=$(echo $VERSION_ENTRIES | sed "s/\"//g" ) VERSION_ENTRIES=$(echo $VERSION_ENTRIES | sed "s/\"//g" )
extract_version_number extract_version_number
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment