Further cleanup and harmonization of built-in templates

Author: HenrikBengtsson

DESCRIPTION

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

inst/templates/lsf.tmpl

@@ -5,13 +5,13 @@
 # Author: Henrik Bengtsson 
 ######################################################################
 
-## Job name:
+## Job name
 #BSUB -J <%= job.name %>
 
-## Direct streams to logfile:
+## Direct streams to logfile
 #BSUB -o <%= log.file %>
 
-## Resources needed:
+## Resources needed
 <% if (length(resources) > 0) {
   ## As-is resource specifications
   if ("asis" %in% names(resources)) {

inst/templates/openlava.tmpl

@@ -5,13 +5,13 @@
 # Author: Henrik Bengtsson 
 ######################################################################
 
-## Job name:
+## Job name
 #BSUB -J <%= job.name %>
 
-## Direct streams to logfile:
+## Direct streams to logfile
 #BSUB -o <%= log.file %>
 
-## Resources needed:
+## Resources needed
 <% if (length(resources) > 0) {
   ## As-is resource specifications
   if ("asis" %in% names(resources)) {

inst/templates/sge.tmpl

@@ -4,25 +4,22 @@
 #
 # Author: Henrik Bengtsson 
 ######################################################################
-## Shell:
-#$ -S /bin/bash         # Run this as a bash script (required)
+## Shell
+#$ -S /bin/bash
 
-## Job name:
+## Job name
 #$ -N <%= job.name %>
 
-## Direct streams to logfile:
+## Direct streams to logfile
 #$ -o <%= log.file %>
 
-## Merge standard error and output:
-#$ -j y
+## Merge standard error and output
+#PBS -j y
 
 ## Tell the queue system to use the current directory
 ## as the working directory
 #$ -cwd
 
-## Use environment variables
-#$ -V
-
 ## Resources needed:
 <% if (length(resources) > 0) {
   ## As-is resource specifications

inst/templates/slurm.tmpl

@@ -5,8 +5,9 @@
 # Author: Henrik Bengtsson 
 ######################################################################
 
-
+## Job name
 #SBATCH --job-name=<%= job.name %>
+## Direct streams to logfile
 #SBATCH --output=<%= log.file %>
 
 ## Resources needed:

inst/templates/torque.tmpl

@@ -5,18 +5,15 @@
 # Author: Henrik Bengtsson 
 ######################################################################
 
-## Job name:
+## Job name
 #PBS -N <%= job.name %>
 
-## Direct streams to logfile:
+## Direct streams to logfile
 #PBS -o <%= log.file %>
 
-## Merge standard error and output:
+## Merge standard error and output
 #PBS -j oe
 
-## Email on abort (a) and termination (e), but not when starting (b)
-#PBS -m ae
-
 ## Resources needed:
 <% if (length(resources) > 0) {
   ## As-is resource specifications