Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Solve confict in installVariables #149

Merged
merged 3 commits into from
Dec 2, 2024
Merged

Solve confict in installVariables #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e1f10e3
Solve confict in installVariables
Enaraque Nov 29, 2024
2f6a9b9
Update changelog
Enaraque Nov 29, 2024
23430ec
Change where assistant_deps variable is initilized
Enaraque Nov 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion install_functions/installCommon.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions install_functions/installVariables.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,5 @@ 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