diff --git a/build_system/lpm_utility_script/lpm_bashrc_config.bash b/build_system/lpm_utility_script/lpm_bashrc_config.bash index 2bca16c0..5fdbf3c8 100644 --- a/build_system/lpm_utility_script/lpm_bashrc_config.bash +++ b/build_system/lpm_utility_script/lpm_bashrc_config.bash @@ -25,11 +25,11 @@ function lpm::configure_bashrc() { source "${N2ST_PATH}/import_norlab_shell_script_tools_lib.bash" # ====Begin====================================================================================== - print_formated_script_header 'lpm_bashrc_config.bash' "${MSG_LINE_CHAR_UTIL}" + n2st::print_formated_script_header 'lpm_bashrc_config.bash' "${MSG_LINE_CHAR_UTIL}" if [[ "$(basename ${LPM_PATH})" != "${NBS_REPOSITORY_NAME}" ]]; then - print_msg_error_and_exit "Can't find directory ${MSG_DIMMED_FORMAT}${NBS_REPOSITORY_NAME}${MSG_END_FORMAT}" + n2st::print_msg_error_and_exit "Can't find directory ${MSG_DIMMED_FORMAT}${NBS_REPOSITORY_NAME}${MSG_END_FORMAT}" fi @@ -47,9 +47,9 @@ function lpm::configure_bashrc() { # echo "alias lpm_attach='cd $DN_PATH && bash dn_attach.bash'" fi - print_msg_done "New aliases with prefix 'lpm' added to .bashrc" + n2st::print_msg_done "New aliases with prefix 'lpm' added to .bashrc" - print_formated_script_footer 'lpm_bashrc_config.bash' "${MSG_LINE_CHAR_UTIL}" + n2st::print_formated_script_footer 'lpm_bashrc_config.bash' "${MSG_LINE_CHAR_UTIL}" # ====Teardown=================================================================================== cd "${TMP_CWD}" diff --git a/build_system/tests/tests_docker_interactive/build_and_run_IamBuildSystemTester.bash b/build_system/tests/tests_docker_interactive/build_and_run_IamBuildSystemTester.bash index 5f2c5582..c3293560 100644 --- a/build_system/tests/tests_docker_interactive/build_and_run_IamBuildSystemTester.bash +++ b/build_system/tests/tests_docker_interactive/build_and_run_IamBuildSystemTester.bash @@ -34,28 +34,28 @@ set -o allexport && source ./build_system/.env && set +o allexport source "./build_system/utilities/norlab-shell-script-tools/import_norlab_shell_script_tools_lib.bash" # ====Begin======================================================================================== -print_formated_script_header 'build_and_run_IamBuildSystemTester.bash' "${MSG_LINE_CHAR_TEST}" +n2st::print_formated_script_header 'build_and_run_IamBuildSystemTester.bash' "${MSG_LINE_CHAR_TEST}" # ....Build image.................................................................................. echo -print_msg "Building 'lpm.ubuntu20.buildsystem.test'" +n2st::print_msg "Building 'lpm.ubuntu20.buildsystem.test'" # Note: Build context must be at repository root pwd tree -L 1 -a -show_and_execute_docker "build -f build_system/tests/tests_docker_interactive/Dockerfile.build_system_test -t lpm.ubuntu20.buildsystem.test ." +n2st::show_and_execute_docker "build -f build_system/tests/tests_docker_interactive/Dockerfile.build_system_test -t lpm.ubuntu20.buildsystem.test ." #--no-cache # ....Run container................................................................................ -print_msg "Starting 'IamBuildSystemTester'" +n2st::print_msg "Starting 'IamBuildSystemTester'" if [[ -n ${DOCKER_CMD_ARGS} ]]; then - print_msg "Passing command ${MSG_DIMMED_FORMAT}\"${DOCKER_CMD_ARGS}\"${MSG_END_FORMAT} to docker run" + n2st::print_msg "Passing command ${MSG_DIMMED_FORMAT}\"${DOCKER_CMD_ARGS}\"${MSG_END_FORMAT} to docker run" fi -show_and_execute_docker "run --name IamBuildSystemTester -it --rm lpm.ubuntu20.buildsystem.test ${DOCKER_CMD_ARGS}" +n2st::show_and_execute_docker "run --name IamBuildSystemTester -it --rm lpm.ubuntu20.buildsystem.test ${DOCKER_CMD_ARGS}" -print_formated_script_footer 'build_and_run_IamBuildSystemTester.bash' "${MSG_LINE_CHAR_TEST}" +n2st::print_formated_script_footer 'build_and_run_IamBuildSystemTester.bash' "${MSG_LINE_CHAR_TEST}" # ====Teardown===================================================================================== cd "${TMP_CWD}" diff --git a/build_system/ubuntu/entrypoint_special_cases/entrypoint_execute_lpm_unittest_conditionally.bash b/build_system/ubuntu/entrypoint_special_cases/entrypoint_execute_lpm_unittest_conditionally.bash index 039fa218..7899a880 100644 --- a/build_system/ubuntu/entrypoint_special_cases/entrypoint_execute_lpm_unittest_conditionally.bash +++ b/build_system/ubuntu/entrypoint_special_cases/entrypoint_execute_lpm_unittest_conditionally.bash @@ -34,7 +34,7 @@ cd "${NBS_LIB_INSTALL_PATH}/${NBS_REPOSITORY_NAME}/build" if [[ -d ./utest ]]; then source "${NBS_LIB_INSTALL_PATH}/${NBS_REPOSITORY_NAME}/build_system/ubuntu/lpm_execute_libpointmatcher_unittest.bash" else - print_msg_warning "Directory ${MSG_DIMMED_FORMAT}utest/${MSG_END_FORMAT} was not created during compilation. + n2st::print_msg_warning "Directory ${MSG_DIMMED_FORMAT}utest/${MSG_END_FORMAT} was not created during compilation. Skipping Libpointmatcher unit-test." fi diff --git a/build_system/ubuntu/lpm_execute_libpointmatcher_unittest.bash b/build_system/ubuntu/lpm_execute_libpointmatcher_unittest.bash index 601c8fba..b4ec00ac 100644 --- a/build_system/ubuntu/lpm_execute_libpointmatcher_unittest.bash +++ b/build_system/ubuntu/lpm_execute_libpointmatcher_unittest.bash @@ -25,7 +25,7 @@ N2ST_PATH=${N2ST_PATH:-"${LPM_PATH}/build_system/utilities/norlab-shell-script-t source "${N2ST_PATH}/import_norlab_shell_script_tools_lib.bash" # ====Begin======================================================================================== -print_formated_script_header 'lpm_execute_libpointmatcher_unittest.bash' ':' +n2st::print_formated_script_header 'lpm_execute_libpointmatcher_unittest.bash' ':' cd "${NBS_LIB_INSTALL_PATH}/${NBS_REPOSITORY_NAME}/build" @@ -33,7 +33,7 @@ if [[ ${IS_TEAMCITY_RUN} == true ]] || [[ ${TEAMCITY_VERSION} ]]; then echo -e "##teamcity[testSuiteStarted name='gtest']" echo -e "##teamcity[testStarted name='gtest' captureStandardOutput='true']" else - print_msg "Starting Libpointmatcher GoogleTest unit-test" + n2st::print_msg "Starting Libpointmatcher GoogleTest unit-test" fi # ................................................................................................. @@ -59,14 +59,14 @@ if [[ ${IS_TEAMCITY_RUN} == true ]] || [[ ${TEAMCITY_VERSION} ]]; then else if [[ ${UTEST_EXIT_CODE} == 0 ]]; then - print_msg_done "${SUCCESS_MSG}" + n2st::print_msg_done "${SUCCESS_MSG}" else - print_msg_error "${FAILURE_MSG}" + n2st::print_msg_error "${FAILURE_MSG}" fi fi -print_formated_script_footer 'lpm_execute_libpointmatcher_unittest.bash' ':' +n2st::print_formated_script_footer 'lpm_execute_libpointmatcher_unittest.bash' ':' # ====Teardown===================================================================================== cd "${TMP_CWD}" exit $UTEST_EXIT_CODE diff --git a/build_system/ubuntu/lpm_install_dependencies_general_ubuntu.bash b/build_system/ubuntu/lpm_install_dependencies_general_ubuntu.bash index d857060d..44226057 100644 --- a/build_system/ubuntu/lpm_install_dependencies_general_ubuntu.bash +++ b/build_system/ubuntu/lpm_install_dependencies_general_ubuntu.bash @@ -40,10 +40,10 @@ cd "${N2ST_PATH}"/src/utility_scripts/ && source "which_architecture_and_os.bash SHOW_SPLASH_IDU="${SHOW_SPLASH_IDU:-true}" if [[ "${SHOW_SPLASH_IDU}" == 'true' ]]; then - norlab_splash "${NBS_SPLASH_NAME}" "https://github.com/${NBS_REPOSITORY_DOMAIN:?err}/${NBS_REPOSITORY_NAME:?err}" + n2st::norlab_splash "${NBS_SPLASH_NAME}" "https://github.com/${NBS_REPOSITORY_DOMAIN:?err}/${NBS_REPOSITORY_NAME:?err}" fi -print_formated_script_header "lpm_install_dependencies_general_ubuntu.bash (${IMAGE_ARCH_AND_OS:?err})" "${MSG_LINE_CHAR_INSTALLER}" +n2st::print_formated_script_header "lpm_install_dependencies_general_ubuntu.bash (${IMAGE_ARCH_AND_OS:?err})" "${MSG_LINE_CHAR_INSTALLER}" # ....Script command line flags.................................................................... while [ $# -gt 0 ]; do @@ -66,7 +66,7 @@ done # ................................................................................................. -teamcity_service_msg_blockOpened "Install development utilities" +n2st::teamcity_service_msg_blockOpened "Install development utilities" sudo apt-get update && sudo apt-get install --assume-yes \ @@ -87,20 +87,20 @@ sudo apt-get update && ##cmake --version -teamcity_service_msg_blockClosed +n2st::teamcity_service_msg_blockClosed # ................................................................................................. # (Priority) ToDo: add check to see if executed in a docker container. Current check does not do what its intended if [[ ${IS_TEAMCITY_RUN} == true ]]; then - print_msg "The install script is run in teamCity >> the python install step was executed earlier in the Dockerfile.dependencies" + n2st::print_msg "The install script is run in teamCity >> the python install step was executed earlier in the Dockerfile.dependencies" else - print_msg "The install script is executed in stand alone mode" + n2st::print_msg "The install script is executed in stand alone mode" cd "${NBS_PATH:?err}/src/utility_scripts" || exit 1 bash "./nbs_install_python_dev_tools.bash" fi # ................................................................................................. -teamcity_service_msg_blockOpened "Install Libpointmatcher dependencies › Boost" +n2st::teamcity_service_msg_blockOpened "Install Libpointmatcher dependencies › Boost" # https://www.boost.org/doc/libs/1_79_0/more/getting_started/unix-variants.html sudo apt-get update && @@ -108,9 +108,9 @@ sudo apt-get update && libboost-all-dev && sudo rm -rf /var/lib/apt/lists/* -teamcity_service_msg_blockClosed +n2st::teamcity_service_msg_blockClosed # ................................................................................................. -teamcity_service_msg_blockOpened "Install Libpointmatcher dependencies › Eigen" +n2st::teamcity_service_msg_blockOpened "Install Libpointmatcher dependencies › Eigen" # https://eigen.tuxfamily.org/index.php sudo apt-get update && @@ -118,18 +118,18 @@ sudo apt-get update && libeigen3-dev && sudo rm -rf /var/lib/apt/lists/* -teamcity_service_msg_blockClosed +n2st::teamcity_service_msg_blockClosed # ................................................................................................. -teamcity_service_msg_blockOpened "Install Libpointmatcher dev tools" +n2st::teamcity_service_msg_blockOpened "Install Libpointmatcher dev tools" sudo apt-get update && sudo apt-get install --assume-yes "${APT_FLAGS[@]}" \ libyaml-cpp-dev && sudo rm -rf /var/lib/apt/lists/* -teamcity_service_msg_blockClosed +n2st::teamcity_service_msg_blockClosed -print_formated_script_footer "lpm_install_dependencies_general_ubuntu.bash (${IMAGE_ARCH_AND_OS})" "${MSG_LINE_CHAR_INSTALLER}" +n2st::print_formated_script_footer "lpm_install_dependencies_general_ubuntu.bash (${IMAGE_ARCH_AND_OS})" "${MSG_LINE_CHAR_INSTALLER}" # ====Teardown===================================================================================== cd "${TMP_CWD}" diff --git a/build_system/ubuntu/lpm_install_dependencies_libnabo_ubuntu.bash b/build_system/ubuntu/lpm_install_dependencies_libnabo_ubuntu.bash index 3c3f2922..b240141a 100644 --- a/build_system/ubuntu/lpm_install_dependencies_libnabo_ubuntu.bash +++ b/build_system/ubuntu/lpm_install_dependencies_libnabo_ubuntu.bash @@ -46,10 +46,10 @@ cd "${N2ST_PATH}"/src/utility_scripts/ && source "which_architecture_and_os.bash SHOW_SPLASH_IDU="${SHOW_SPLASH_IDU:-true}" if [[ "${SHOW_SPLASH_IDU}" == 'true' ]]; then - norlab_splash "${NBS_SPLASH_NAME:?err}" "https://github.com/${NBS_REPOSITORY_DOMAIN:?err}/${NBS_REPOSITORY_NAME:?err}" + n2st::norlab_splash "${NBS_SPLASH_NAME:?err}" "https://github.com/${NBS_REPOSITORY_DOMAIN:?err}/${NBS_REPOSITORY_NAME:?err}" fi -print_formated_script_header "lpm_install_dependencies_libnabo_ubuntu.bash (${IMAGE_ARCH_AND_OS:?err})" "${MSG_LINE_CHAR_INSTALLER}" +n2st::print_formated_script_header "lpm_install_dependencies_libnabo_ubuntu.bash (${IMAGE_ARCH_AND_OS:?err})" "${MSG_LINE_CHAR_INSTALLER}" # ....Script command line flags.................................................................... @@ -77,7 +77,7 @@ done CMAKE_FLAGS=( -D CMAKE_BUILD_TYPE=RelWithDebInfo "${APPEND_TO_CMAKE_FLAG[@]}" ) # ................................................................................................. -teamcity_service_msg_blockOpened "Install Libpointmatcher dependencies › Libnabo" +n2st::teamcity_service_msg_blockOpened "Install Libpointmatcher dependencies › Libnabo" # https://github.com/norlab-ulaval/libnabo ## Note: @@ -108,7 +108,7 @@ teamcity_service_msg_blockOpened "Install Libpointmatcher dependencies › Libna # && sudo rm -rf /var/lib/apt/lists/* # ....Repository cloning step...................................................................... -print_msg "Create required dir structure" +n2st::print_msg "Create required dir structure" mkdir -p "${NBS_LIB_INSTALL_PATH}" cd "${NBS_LIB_INSTALL_PATH}" @@ -119,14 +119,14 @@ git clone https://github.com/norlab-ulaval/libnabo.git && # git checkout 1.0.7 # ....Cmake install step........................................................................... -teamcity_service_msg_compilationStarted "cmake" +n2st::teamcity_service_msg_compilationStarted "cmake" -print_msg "Execute ${MSG_DIMMED_FORMAT} +n2st::print_msg "Execute ${MSG_DIMMED_FORMAT} cmake ${CMAKE_FLAGS[*]} ${NBS_LIB_INSTALL_PATH}/libnabo ${MSG_END_FORMAT}" if [[ $TEST_RUN == true ]]; then - print_msg "Test-run mode: Skipping cmake" + n2st::print_msg "Test-run mode: Skipping cmake" BUILD_EXIT_CODE=0 INSTALL_EXIT_CODE=0 else @@ -140,12 +140,12 @@ else # make -j $(nproc) && make test && sudo make install fi -teamcity_service_msg_compilationFinished +n2st::teamcity_service_msg_compilationFinished -teamcity_service_msg_blockClosed +n2st::teamcity_service_msg_blockClosed -echo " " && print_msg_done "Libpointmatcher dependencies installed" -print_formated_script_footer "lpm_install_dependencies_libnabo_ubuntu.bash (${IMAGE_ARCH_AND_OS})" "${MSG_LINE_CHAR_INSTALLER}" +echo " " && n2st::print_msg_done "Libpointmatcher dependencies installed" +n2st::print_formated_script_footer "lpm_install_dependencies_libnabo_ubuntu.bash (${IMAGE_ARCH_AND_OS})" "${MSG_LINE_CHAR_INSTALLER}" # ====Teardown===================================================================================== cd "${TMP_CWD}" diff --git a/build_system/ubuntu/lpm_install_doc_dependencies_ubuntu.bash b/build_system/ubuntu/lpm_install_doc_dependencies_ubuntu.bash index 2997b097..e9d39724 100644 --- a/build_system/ubuntu/lpm_install_doc_dependencies_ubuntu.bash +++ b/build_system/ubuntu/lpm_install_doc_dependencies_ubuntu.bash @@ -48,10 +48,10 @@ cd "${N2ST_PATH}"/src/utility_scripts/ && source "which_architecture_and_os.bash SHOW_SPLASH_IDDU="${SHOW_SPLASH_IDDU:-true}" if [[ "${SHOW_SPLASH_IDDU}" == 'true' ]]; then - norlab_splash "${NBS_SPLASH_NAME:?err}" "https://github.com/${NBS_REPOSITORY_DOMAIN:?err}/${NBS_REPOSITORY_NAME:?err}" + n2st::norlab_splash "${NBS_SPLASH_NAME:?err}" "https://github.com/${NBS_REPOSITORY_DOMAIN:?err}/${NBS_REPOSITORY_NAME:?err}" fi -print_formated_script_header "lpm_install_doc_dependencies_ubuntu.bash (${IMAGE_ARCH_AND_OS:?err})" "${MSG_LINE_CHAR_INSTALLER}" +n2st::print_formated_script_header "lpm_install_doc_dependencies_ubuntu.bash (${IMAGE_ARCH_AND_OS:?err})" "${MSG_LINE_CHAR_INSTALLER}" # ....Script command line flags.................................................................... while [ $# -gt 0 ]; do @@ -74,7 +74,7 @@ done # ................................................................................................. -teamcity_service_msg_blockOpened "Install libpointmatcher documentation related dependencies" +n2st::teamcity_service_msg_blockOpened "Install libpointmatcher documentation related dependencies" ## Package required when GENERATE_API_DOC flag is set to true ## Note: 'texlive-full' is ~6GB. 'doxygen-latex' is a slim version tailor made for doxygen code documentation task @@ -84,10 +84,10 @@ sudo apt-get update \ doxygen-latex \ && sudo rm -rf /var/lib/apt/lists/* -teamcity_service_msg_blockClosed +n2st::teamcity_service_msg_blockClosed -echo " " && print_msg_done "Libpointmatcher documentation related dependencies installed" -print_formated_script_footer "lpm_install_doc_dependencies_ubuntu.bash (${IMAGE_ARCH_AND_OS})" "${MSG_LINE_CHAR_INSTALLER}" +echo " " && n2st::print_msg_done "Libpointmatcher documentation related dependencies installed" +n2st::print_formated_script_footer "lpm_install_doc_dependencies_ubuntu.bash (${IMAGE_ARCH_AND_OS})" "${MSG_LINE_CHAR_INSTALLER}" # ====Teardown===================================================================================== cd "${TMP_CWD}" diff --git a/build_system/ubuntu/lpm_install_libpointmatcher_ubuntu.bash b/build_system/ubuntu/lpm_install_libpointmatcher_ubuntu.bash index ef5f61c3..63f92425 100644 --- a/build_system/ubuntu/lpm_install_libpointmatcher_ubuntu.bash +++ b/build_system/ubuntu/lpm_install_libpointmatcher_ubuntu.bash @@ -68,7 +68,7 @@ source "${N2ST_PATH}/import_norlab_shell_script_tools_lib.bash" # Set environment variable IMAGE_ARCH_AND_OS cd "${N2ST_PATH}"/src/utility_scripts/ && source "which_architecture_and_os.bash" -function print_help_in_terminal() { +function lpm::print_help_in_terminal() { echo -e "\$ ${0} [] \033[1m:\033[0m @@ -99,10 +99,10 @@ function print_help_in_terminal() { SHOW_SPLASH_ILU="${SHOW_SPLASH_ILU:-true}" if [[ "${SHOW_SPLASH_ILU}" == 'true' ]]; then - norlab_splash "${NBS_SPLASH_NAME:?err}" "https://github.com/${NBS_REPOSITORY_DOMAIN:?err}/${NBS_REPOSITORY_NAME:?err}" + n2st::norlab_splash "${NBS_SPLASH_NAME:?err}" "https://github.com/${NBS_REPOSITORY_DOMAIN:?err}/${NBS_REPOSITORY_NAME:?err}" fi -print_formated_script_header "${CALLER_NAME} (${IMAGE_ARCH_AND_OS:?err})" "${MSG_LINE_CHAR_INSTALLER}" +n2st::print_formated_script_header "${CALLER_NAME} (${IMAGE_ARCH_AND_OS:?err})" "${MSG_LINE_CHAR_INSTALLER}" # ....Script command line flags.................................................................... @@ -142,7 +142,7 @@ while [ $# -gt 0 ]; do shift ;; -h | --help) - print_help_in_terminal + lpm::print_help_in_terminal exit ;; --) # no more option @@ -172,17 +172,17 @@ CMAKE_FLAGS=( -D CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" -D BUILD_TESTS="${BUILD_ # -D LIBNABO_INSTALL_DIR="${NBS_LIB_INSTALL_PATH}/libnabo" \ # ----Install steps-------------------------------------------------------------------------------- -teamcity_service_msg_blockOpened "Install ${NBS_REPOSITORY_NAME}" +n2st::teamcity_service_msg_blockOpened "Install ${NBS_REPOSITORY_NAME}" mkdir -p "${NBS_LIB_INSTALL_PATH}" -print_msg "Directories (pre libpointmatcher install)$(tree -L 2 "${NBS_LIB_INSTALL_PATH}")" +n2st::print_msg "Directories (pre libpointmatcher install)$(tree -L 2 "${NBS_LIB_INSTALL_PATH}")" cd "${NBS_LIB_INSTALL_PATH}" # ....Repository cloning step...................................................................... if [[ ${BUILD_SYSTEM_CI_INSTALL} == FALSE ]]; then if [[ -d ${NBS_REPOSITORY_NAME}/.git ]]; then - print_msg_error_and_exit "${MSG_DIMMED_FORMAT}${NBS_REPOSITORY_NAME}${MSG_END_FORMAT} source code was already checkout in the specified install directory ${MSG_DIMMED_FORMAT}${NBS_LIB_INSTALL_PATH}/${MSG_END_FORMAT}, specify an other one using ${MSG_DIMMED_FORMAT}--install-path ${MSG_END_FORMAT}." + n2st::print_msg_error_and_exit "${MSG_DIMMED_FORMAT}${NBS_REPOSITORY_NAME}${MSG_END_FORMAT} source code was already checkout in the specified install directory ${MSG_DIMMED_FORMAT}${NBS_LIB_INSTALL_PATH}/${MSG_END_FORMAT}, specify an other one using ${MSG_DIMMED_FORMAT}--install-path ${MSG_END_FORMAT}." fi git clone https://github.com/"${NBS_REPOSITORY_DOMAIN}"/"${NBS_REPOSITORY_NAME}".git @@ -199,7 +199,7 @@ if [[ ${BUILD_SYSTEM_CI_INSTALL} == FALSE ]]; then git checkout tags/"${GITHUB_TAG}" - print_msg "Repository checkout at tag $(git symbolic-ref -q --short HEAD || git describe --tags --exact-match)" + n2st::print_msg "Repository checkout at tag $(git symbolic-ref -q --short HEAD || git describe --tags --exact-match)" fi fi @@ -207,14 +207,14 @@ cd "${NBS_LIB_INSTALL_PATH}/${NBS_REPOSITORY_NAME}" mkdir -p build && cd build # ....Cmake install step........................................................................... -teamcity_service_msg_compilationStarted "cmake" +n2st::teamcity_service_msg_compilationStarted "cmake" -print_msg "Execute ${MSG_DIMMED_FORMAT} +n2st::print_msg "Execute ${MSG_DIMMED_FORMAT} cmake ${CMAKE_FLAGS[*]} ${NBS_LIB_INSTALL_PATH}/${NBS_REPOSITORY_NAME} ${MSG_END_FORMAT}" if [[ $TEST_RUN == true ]]; then - print_msg "Test-run mode: Skipping cmake" + n2st::print_msg "Test-run mode: Skipping cmake" BUILD_EXIT_CODE=0 INSTALL_EXIT_CODE=0 else @@ -240,10 +240,10 @@ else #cmake -LAH fi -print_msg "Directories (post ${NBS_REPOSITORY_NAME} install)$(tree -L 2 ${NBS_LIB_INSTALL_PATH})" +n2st::print_msg "Directories (post ${NBS_REPOSITORY_NAME} install)$(tree -L 2 ${NBS_LIB_INSTALL_PATH})" -teamcity_service_msg_compilationFinished -teamcity_service_msg_blockClosed +n2st::teamcity_service_msg_compilationFinished +n2st::teamcity_service_msg_blockClosed # ....Install/build feedback....................................................................... SUCCESS_MSG="${NBS_REPOSITORY_NAME} installed successfully at ${MSG_DIMMED_FORMAT}${NBS_LIB_INSTALL_PATH}/${NBS_REPOSITORY_NAME}${MSG_END_FORMAT}" @@ -256,20 +256,20 @@ if [[ ${IS_TEAMCITY_RUN} == true ]]; then else if [[ ${BUILD_EXIT_CODE} != 0 ]]; then echo -e "##teamcity[message text='${MSG_BASE_TEAMCITY} ${FAILURE_MSG}' errorDetails='$BUILD_EXIT_CODE' status='ERROR']" - print_formated_script_footer "${CALLER_NAME} (${IMAGE_ARCH_AND_OS})" "${MSG_LINE_CHAR_INSTALLER}" + n2st::print_formated_script_footer "${CALLER_NAME} (${IMAGE_ARCH_AND_OS})" "${MSG_LINE_CHAR_INSTALLER}" exit $BUILD_EXIT_CODE else echo -e "##teamcity[message text='${MSG_BASE_TEAMCITY} ${FAILURE_MSG}' errorDetails='$INSTALL_EXIT_CODE' status='ERROR']" - print_formated_script_footer "${CALLER_NAME} (${IMAGE_ARCH_AND_OS})" "${MSG_LINE_CHAR_INSTALLER}" + n2st::print_formated_script_footer "${CALLER_NAME} (${IMAGE_ARCH_AND_OS})" "${MSG_LINE_CHAR_INSTALLER}" exit $INSTALL_EXIT_CODE fi fi else if [[ ${BUILD_EXIT_CODE} == 0 ]] && [[ ${INSTALL_EXIT_CODE} == 0 ]]; then - echo " " && print_msg_done "${SUCCESS_MSG}" + echo " " && n2st::print_msg_done "${SUCCESS_MSG}" else - print_msg_error "${FAILURE_MSG}" - print_formated_script_footer "${CALLER_NAME} (${IMAGE_ARCH_AND_OS})" "${MSG_LINE_CHAR_INSTALLER}" + n2st::print_msg_error "${FAILURE_MSG}" + n2st::print_formated_script_footer "${CALLER_NAME} (${IMAGE_ARCH_AND_OS})" "${MSG_LINE_CHAR_INSTALLER}" if [[ ${BUILD_EXIT_CODE} != 0 ]]; then exit $BUILD_EXIT_CODE else @@ -278,7 +278,7 @@ else fi fi -print_formated_script_footer "${CALLER_NAME} (${IMAGE_ARCH_AND_OS})" "${MSG_LINE_CHAR_INSTALLER}" +n2st::print_formated_script_footer "${CALLER_NAME} (${IMAGE_ARCH_AND_OS})" "${MSG_LINE_CHAR_INSTALLER}" # ====Teardown===================================================================================== cd "${TMP_CWD}" diff --git a/build_system/utilities/norlab-build-system b/build_system/utilities/norlab-build-system index 54bab512..ddd22afa 160000 --- a/build_system/utilities/norlab-build-system +++ b/build_system/utilities/norlab-build-system @@ -1 +1 @@ -Subproject commit 54bab5126598a5f92104eb6b30b278d8e89629f4 +Subproject commit ddd22afa66674adb309251992548260e1455a9ca diff --git a/build_system/utilities/norlab-shell-script-tools b/build_system/utilities/norlab-shell-script-tools index f6de2392..975e5b7d 160000 --- a/build_system/utilities/norlab-shell-script-tools +++ b/build_system/utilities/norlab-shell-script-tools @@ -1 +1 @@ -Subproject commit f6de2392d221474eb21c739b23ab55ee1f706cce +Subproject commit 975e5b7d88b48b55f7458121b46f933547414495 diff --git a/libpointmatcher_dependencies_installer.bash b/libpointmatcher_dependencies_installer.bash index fe3d6052..4061fa17 100644 --- a/libpointmatcher_dependencies_installer.bash +++ b/libpointmatcher_dependencies_installer.bash @@ -15,7 +15,7 @@ MSG_DIMMED_FORMAT="\033[1;2m" MSG_ERROR_FORMAT="\033[1;31m" MSG_END_FORMAT="\033[0m" -function lpm::install_libpointmatcher_dependencise(){ +function lpm::install_libpointmatcher_dependencies(){ # ....path resolution logic...................................................................... LPM_ROOT="$(dirname "$(realpath "$0")")" @@ -46,7 +46,7 @@ function lpm::install_libpointmatcher_dependencise(){ # ====Begin====================================================================================== - norlab_splash "${NBS_SPLASH_NAME}" "https://github.com/${NBS_REPOSITORY_DOMAIN:?err}/${NBS_REPOSITORY_NAME:?err}" + n2st::norlab_splash "${NBS_SPLASH_NAME}" "https://github.com/${NBS_REPOSITORY_DOMAIN:?err}/${NBS_REPOSITORY_NAME:?err}" export SHOW_SPLASH_IDU=false export SHOW_SPLASH_IDDU=false @@ -66,13 +66,13 @@ function lpm::install_libpointmatcher_dependencise(){ # shellcheck disable=SC2086 source lpm_install_doc_dependencies_ubuntu.bash ${PARAMS[@]} - print_msg_done "All Libpointmatcher dependencies installed" + n2st::print_msg_done "All Libpointmatcher dependencies installed" } # ::::Main::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: if [[ "${BASH_SOURCE[0]}" = "$0" ]]; then # This script is being run, ie: __name__="__main__" - lpm::install_libpointmatcher_dependencise + lpm::install_libpointmatcher_dependencies else # This script is being sourced, ie: __name__="__source__" echo -e "${MSG_ERROR_FORMAT}[LPM ERROR]${MSG_END_FORMAT} Execute this script in a subshell i.e.: $ bash libpointmatcher_dependencies_installer.bash" 1>&2 diff --git a/libpointmatcher_installer.bash b/libpointmatcher_installer.bash index c229f31b..2abdfcc5 100644 --- a/libpointmatcher_installer.bash +++ b/libpointmatcher_installer.bash @@ -62,7 +62,7 @@ function lpm::install_libpointmatcher(){ fi # ====Begin====================================================================================== - norlab_splash "${NBS_SPLASH_NAME}" "https://github.com/${NBS_REPOSITORY_DOMAIN:?err}/${NBS_REPOSITORY_NAME:?err}" + n2st::norlab_splash "${NBS_SPLASH_NAME}" "https://github.com/${NBS_REPOSITORY_DOMAIN:?err}/${NBS_REPOSITORY_NAME:?err}" export SHOW_SPLASH_ILU=false # ....Install general dependencies............................................................... @@ -71,7 +71,7 @@ function lpm::install_libpointmatcher(){ # shellcheck disable=SC2068 source lpm_install_libpointmatcher_ubuntu.bash ${PARAMS[@]} - print_msg_done "Libpointmatcher install script completed. Have fun" + n2st::print_msg_done "Libpointmatcher install script completed. Have fun" } # ::::Main:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::