Skip to content

Commit

Permalink
Small fixes to HP-UX generate package script
Browse files Browse the repository at this point in the history
When exporting PATH we moved the previously defined env PATH to the end
to favor the dependencies installed by the script over the pre installed by the system.

The clean() function no longer deletes the build folder containing gcc and cmake, it only
removes the folder when the -e option is passed to the script.
  • Loading branch information
jr0me committed Jan 18, 2024
1 parent acbd5c1 commit 82a2c11
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions hp-ux/generate_wazuh_packages.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ depot_path=""
control_binary=""

# Needed variables to build Wazuh with custom GCC and cmake
PATH=${build_tools_path}/bootstrap-gcc/gcc94_prefix/bin:${build_tools_path}/cmake_prefix_install/bin:$PATH:/usr/local/bin
PATH=${build_tools_path}/bootstrap-gcc/gcc94_prefix/bin:${build_tools_path}/cmake_prefix_install/bin:/usr/local/bin:$PATH
LD_LIBRARY_PATH=${build_tools_path}/bootstrap-gcc/gcc94_prefix/lib
export LD_LIBRARY_PATH
CXX=${build_tools_path}/bootstrap-gcc/gcc94_prefix/bin/g++
Expand Down Expand Up @@ -71,6 +71,8 @@ build_environment() {
/usr/local/bin/depothelper $fpt_connection -f regex
/usr/local/bin/depothelper $fpt_connection -f python

rm -rf ${build_tools_path}

# Install GCC 9.4
mkdir ${build_tools_path}
cd ${build_tools_path}
Expand Down Expand Up @@ -201,8 +203,6 @@ clean() {
userdel wazuh
groupdel wazuh

rm -rf ${build_tools_path}

exit ${exit_code}
}

Expand Down

0 comments on commit 82a2c11

Please sign in to comment.