Built-in templates: improve ERR trap to mention future.batchtools and prefix with ERROR:

Author: HenrikBengtsson

DESCRIPTION

@@ -1,5 +1,5 @@
 Package: future.batchtools
-Version: 0.12.2-9973
+Version: 0.12.2-9974
 Depends:
     R (>= 3.2.0),
     parallelly,

inst/templates/bash.tmpl

@@ -9,7 +9,8 @@
 set -e          # exit on error
 set -u          # error on unset variables
 set -o pipefail # fail a pipeline if any command fails
-trap 'echo "Error on line $LINENO"; exit 1' ERR
+trap 'echo "ERROR: future.batchtools job script failed on line $LINENO" >&2; exit 1' ERR
+
 
 <%
   ## Maximum runtime?

inst/templates/lsf.tmpl

@@ -32,7 +32,7 @@
 set -e          # exit on error
 set -u          # error on unset variables
 set -o pipefail # fail a pipeline if any command fails
-trap 'echo "Error on line $LINENO"; exit 1' ERR
+trap 'echo "ERROR: future.batchtools job script failed on line $LINENO" >&2; exit 1' ERR
 
 echo "Batchtools information:"
 echo "- job name: '<%= job.name %>'"

inst/templates/openlava.tmpl

@@ -32,7 +32,7 @@
 set -e          # exit on error
 set -u          # error on unset variables
 set -o pipefail # fail a pipeline if any command fails
-trap 'echo "Error on line $LINENO"; exit 1' ERR
+trap 'echo "ERROR: future.batchtools job script failed on line $LINENO" >&2; exit 1' ERR
 
 echo "Batchtools information:"
 echo "- job name: '<%= job.name %>'"

inst/templates/sge.tmpl

@@ -41,7 +41,7 @@
 set -e          # exit on error
 set -u          # error on unset variables
 set -o pipefail # fail a pipeline if any command fails
-trap 'echo "Error on line $LINENO"; exit 1' ERR
+trap 'echo "ERROR: future.batchtools job script failed on line $LINENO" >&2; exit 1' ERR
 
 echo "Batchtools information:"
 echo "- job name: '<%= job.name %>'"

inst/templates/slurm.tmpl

@@ -31,7 +31,7 @@
 set -e          # exit on error
 set -u          # error on unset variables
 set -o pipefail # fail a pipeline if any command fails
-trap 'echo "Error on line $LINENO"; exit 1' ERR
+trap 'echo "ERROR: future.batchtools job script failed on line $LINENO" >&2; exit 1' ERR
 
 echo "Batchtools information:"
 echo "- job name: '<%= job.name %>'"

inst/templates/torque.tmpl

@@ -35,7 +35,7 @@
 set -e          # exit on error
 set -u          # error on unset variables
 set -o pipefail # fail a pipeline if any command fails
-trap 'echo "Error on line $LINENO"; exit 1' ERR
+trap 'echo "ERROR: future.batchtools job script failed on line $LINENO" >&2; exit 1' ERR
 
 echo "Batchtools information:"
 echo "- job name: '<%= job.name %>'"