From a88f943b0cdbbaa3bd1f01e63c6188f316691c0c Mon Sep 17 00:00:00 2001 From: henrykironde Date: Mon, 8 Jan 2024 20:49:29 -0500 Subject: [PATCH] Ensure forced exit on errors To prevent the archiving of incorrect files, both PortalForecasts_dryrun.R and PortalForecasts.R should terminate execution immediately upon encountering errors. --- portal_dryrun_forecast.sh | 2 +- portal_weekly_forecast.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/portal_dryrun_forecast.sh b/portal_dryrun_forecast.sh index d53a938d..ed956c3d 100644 --- a/portal_dryrun_forecast.sh +++ b/portal_dryrun_forecast.sh @@ -24,7 +24,7 @@ git clone https://github.com/weecology/portal-forecasts.git cd portal-forecasts echo "INFO [$(date "+%Y-%m-%d %H:%M:%S")] Running Portal Forecasts" -singularity run ../portalcasting_latest.sif Rscript PortalForecasts_dryrun.R +singularity run ../portalcasting_latest.sif Rscript PortalForecasts_dryrun.R 2>&1 || exit 1 echo "INFO [$(date "+%Y-%m-%d %H:%M:%S")] Checking if forecasts were successful" # Redirect stderr(2) to stdout(1) if command fails, and exit script with 1 diff --git a/portal_weekly_forecast.sh b/portal_weekly_forecast.sh index dce9071d..cb6e7b8e 100644 --- a/portal_weekly_forecast.sh +++ b/portal_weekly_forecast.sh @@ -24,7 +24,7 @@ git clone https://github.com/weecology/portal-forecasts.git cd portal-forecasts echo "INFO [$(date "+%Y-%m-%d %H:%M:%S")] Running Portal Forecasts" -singularity run ../portalcasting_latest.sif Rscript PortalForecasts.R +singularity run ../portalcasting_latest.sif Rscript PortalForecasts.R 2>&1 || exit 1 echo "INFO [$(date "+%Y-%m-%d %H:%M:%S")] Checking if forecasts were successful" # Redirect stderr(2) to stdout(1) if command fails, and exit script with 1