Drop support for rscript = "*" - does not make sense

Author: HenrikBengtsson

DESCRIPTION

@@ -1,5 +1,5 @@
 Package: future.batchtools
-Version: 0.20.0-9022
+Version: 0.20.0-9023
 Depends:
     R (>= 3.2.0),
     parallelly,

R/batchtools_slurm.R

@@ -118,7 +118,7 @@ print.BatchtoolsSlurmFutureBackend <- function(x, ...) {
 #'   modules = c("r", "jags"),
 #'   details = TRUE,
 #'   envs = c(R_LIBS_USER="~/R/rocker-%p-library/%v-CBI-gcc13"),
-#'   rscript = c("apptainer", "exec", "~/lxc/rocker_r-base.sif", "*")
+#'   rscript = c("apptainer", "exec", "~/lxc/rocker_r-base.sif", "Rscript")
 #' ))
 #'
 #' f <- future({

inst/templates/bash.tmpl

@@ -31,9 +31,8 @@ exec > <%= log.file %> 2>&1
   rscript <- resources[["rscript"]]
   if (is.null(rscript)) {
     rscript <- "Rscript"
-  } else {
-    if (length(rscript) == 0 || !nzchar(rscript)[1]) stop("Argument 'resources' specifies an empty 'rscript' field")
-    rscript[rscript == "*"] <- "Rscript"
+  } else if (length(rscript) == 0 || !nzchar(rscript)[1]) {
+    stop("Argument 'resources' specifies an empty 'rscript' field")
   }
   resources[["rscript"]] <- NULL
 

inst/templates/lsf.tmpl

@@ -33,9 +33,8 @@
   rscript <- resources[["rscript"]]
   if (is.null(rscript)) {
     rscript <- "Rscript"
-  } else {
-    if (length(rscript) == 0 || !nzchar(rscript)[1]) stop("Argument 'resources' specifies an empty 'rscript' field")
-    rscript[rscript == "*"] <- "Rscript"
+  } else if (length(rscript) == 0 || !nzchar(rscript)[1]) {
+    stop("Argument 'resources' specifies an empty 'rscript' field")
   }
   resources[["rscript"]] <- NULL
   rscript_args <- resources[["rscript_args"]]

inst/templates/openlava.tmpl

@@ -33,9 +33,8 @@
   rscript <- resources[["rscript"]]
   if (is.null(rscript)) {
     rscript <- "Rscript"
-  } else {
-    if (length(rscript) == 0 || !nzchar(rscript)[1]) stop("Argument 'resources' specifies an empty 'rscript' field")
-    rscript[rscript == "*"] <- "Rscript"
+  } else if (length(rscript) == 0 || !nzchar(rscript)[1]) {
+    stop("Argument 'resources' specifies an empty 'rscript' field")
   }
   resources[["rscript"]] <- NULL
   rscript_args <- resources[["rscript_args"]]

inst/templates/sge.tmpl

@@ -42,9 +42,8 @@
   rscript <- resources[["rscript"]]
   if (is.null(rscript)) {
     rscript <- "Rscript"
-  } else {
-    if (length(rscript) == 0 || !nzchar(rscript)[1]) stop("Argument 'resources' specifies an empty 'rscript' field")
-    rscript[rscript == "*"] <- "Rscript"
+  } else if (length(rscript) == 0 || !nzchar(rscript)[1]) {
+    stop("Argument 'resources' specifies an empty 'rscript' field")
   }
   resources[["rscript"]] <- NULL
   rscript_args <- resources[["rscript_args"]]

inst/templates/slurm.tmpl

@@ -32,9 +32,8 @@
   rscript <- resources[["rscript"]]
   if (is.null(rscript)) {
     rscript <- "Rscript"
-  } else {
-    if (length(rscript) == 0 || !nzchar(rscript)[1]) stop("Argument 'resources' specifies an empty 'rscript' field")
-    rscript[rscript == "*"] <- "Rscript"
+  } else if (length(rscript) == 0 || !nzchar(rscript)[1]) {
+    stop("Argument 'resources' specifies an empty 'rscript' field")
   }
   resources[["rscript"]] <- NULL
   rscript_args <- resources[["rscript_args"]]

inst/templates/torque.tmpl

@@ -36,9 +36,8 @@
   rscript <- resources[["rscript"]]
   if (is.null(rscript)) {
     rscript <- "Rscript"
-  } else {
-    if (length(rscript) == 0 || !nzchar(rscript)[1]) stop("Argument 'resources' specifies an empty 'rscript' field")
-    rscript[rscript == "*"] <- "Rscript"
+  } else if (length(rscript) == 0 || !nzchar(rscript)[1]) {
+    stop("Argument 'resources' specifies an empty 'rscript' field")
   }
   resources[["rscript"]] <- NULL
   rscript_args <- resources[["rscript_args"]]