From e1f10e31067062cd0ec64c4076dc52a4e592d3d2 Mon Sep 17 00:00:00 2001 From: Enrique Araque Date: Fri, 29 Nov 2024 11:54:56 +0100 Subject: [PATCH 1/3] Solve confict in installVariables --- install_functions/installVariables.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/install_functions/installVariables.sh b/install_functions/installVariables.sh index cc5e2c2..75a0e50 100644 --- a/install_functions/installVariables.sh +++ b/install_functions/installVariables.sh @@ -71,9 +71,4 @@ readonly indexer_yum_dependencies=( coreutils ) readonly indexer_apt_dependencies=( debconf adduser procps gnupg apt-transport-https ) readonly dashboard_yum_dependencies=( libcap ) readonly dashboard_apt_dependencies=( debhelper tar curl libcap2-bin gnupg apt-transport-https ) -<<<<<<< HEAD readonly wia_offline_dependencies=( curl tar gnupg openssl lsof ) -wia_dependencies_installed=() -======= -assistant_deps_to_install=() ->>>>>>> b2f4e7a0928581ea3ce69f46a7a101bcba2fc708 From 2f6a9b91f0fd8a8e0617b968205f33a0fab4b05d Mon Sep 17 00:00:00 2001 From: Enrique Araque Date: Fri, 29 Nov 2024 11:59:20 +0100 Subject: [PATCH 2/3] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b40bda3..2105e4f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,7 @@ All notable changes to this project will be documented in this file. ### Fixed +- Solve confict in installVariables ([#149](https://github.com/wazuh/wazuh-installation-assistant/pull/149)) - Print getHelp output when no parameter is passed to the builder script. ([#142](https://github.com/wazuh/wazuh-installation-assistant/pull/142)) ### Deleted From 23430ec9946f75a8f845f8399913f21db9994d83 Mon Sep 17 00:00:00 2001 From: Enrique Araque Date: Fri, 29 Nov 2024 12:57:05 +0100 Subject: [PATCH 3/3] Change where assistant_deps variable is initilized --- install_functions/installCommon.sh | 1 - install_functions/installVariables.sh | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/install_functions/installCommon.sh b/install_functions/installCommon.sh index f705067..ed5731b 100644 --- a/install_functions/installCommon.sh +++ b/install_functions/installCommon.sh @@ -743,7 +743,6 @@ function installCommon_scanDependencies() { # Delete duplicates and sort all_deps+=( "${assistant_deps[@]}" ) all_deps=( $(echo "${all_deps[@]}" | tr ' ' '\n' | sort -u) ) - assistant_deps_to_install=() deps_to_install=() # Get not installed dependencies of Assistant and Wazuh diff --git a/install_functions/installVariables.sh b/install_functions/installVariables.sh index 75a0e50..dfef882 100644 --- a/install_functions/installVariables.sh +++ b/install_functions/installVariables.sh @@ -72,3 +72,4 @@ readonly indexer_apt_dependencies=( debconf adduser procps gnupg apt-transport-h readonly dashboard_yum_dependencies=( libcap ) readonly dashboard_apt_dependencies=( debhelper tar curl libcap2-bin gnupg apt-transport-https ) readonly wia_offline_dependencies=( curl tar gnupg openssl lsof ) +assistant_deps_to_install=()