From 9f801fc5ed545e390e8a7c84e8d2f84b1405fd44 Mon Sep 17 00:00:00 2001 From: Ola Date: Sat, 24 Aug 2024 15:17:55 +0200 Subject: [PATCH] Make sure all functions execute regardless of individual return code --- scripts/grest-helper-scripts/setup-grest.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/grest-helper-scripts/setup-grest.sh b/scripts/grest-helper-scripts/setup-grest.sh index e5bc42e53..428e01b54 100755 --- a/scripts/grest-helper-scripts/setup-grest.sh +++ b/scripts/grest-helper-scripts/setup-grest.sh @@ -683,12 +683,12 @@ SGVERSION=v1.2.0a set_environment_variables parse_args common_update - [[ "${INSTALL_POSTGREST}" == "Y" ]] && setup_db_basics && deploy_postgrest - [[ "${INSTALL_HAPROXY}" == "Y" ]] && deploy_haproxy - [[ "${INSTALL_MONITORING_AGENTS}" == "Y" ]] && deploy_monitoring_agents - [[ "${OVERWRITE_CONFIG}" == "Y" ]] && deploy_configs - [[ "${OVERWRITE_SYSTEMD}" == "Y" ]] && deploy_systemd - [[ "${RESET_GREST}" == "Y" ]] && remove_all_grest_cron_jobs && reset_grest && deploy_b32_ext - [[ "${DB_QRY_UPDATES}" == "Y" ]] && remove_all_grest_cron_jobs && setup_db_basics && deploy_query_updates && update_grest_version + if [[ "${INSTALL_POSTGREST}" == "Y" ]]; then setup_db_basics; deploy_postgrest; fi + if [[ "${INSTALL_HAPROXY}" == "Y" ]]; then deploy_haproxy; fi + if [[ "${INSTALL_MONITORING_AGENTS}" == "Y" ]]; then deploy_monitoring_agents; fi + if [[ "${OVERWRITE_CONFIG}" == "Y" ]]; then deploy_configs; fi + if [[ "${OVERWRITE_SYSTEMD}" == "Y" ]]; then deploy_systemd; fi + if [[ "${RESET_GREST}" == "Y" ]]; then remove_all_grest_cron_jobs; reset_grest; deploy_b32_ext; fi + if [[ "${DB_QRY_UPDATES}" == "Y" ]]; then remove_all_grest_cron_jobs; setup_db_basics; deploy_query_updates; update_grest_version; fi pushd -0 >/dev/null || err_exit dirs -c