Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
Package: batchtools
Title: Tools for Computation on Batch Systems
Version: 0.9.18
Version: 0.9.19
Authors@R: c(
person("Michel", "Lang", , "michellang@gmail.com", role = c("cre", "aut"),
comment = c(ORCID = "0000-0001-9754-0393")),
person("Bernd", "Bischl", , "bernd_bischl@gmx.net", role = "aut"),
person("Dirk", "Surmann", , "surmann@statistik.tu-dortmund.de", role = "ctb",
comment = c(ORCID = "0000-0003-0873-137X"))
comment = c(ORCID = "0000-0003-0873-137X")),
person("Lukas", "Burk", , "sgithub@quantenbrot.de", role = "ctb",
comment = c(ORCID = "0000-0001-7528-3795"))
)
Description: As a successor of the packages 'BatchJobs' and
'BatchExperiments', this package provides a parallel implementation of
Expand Down
4 changes: 4 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# batchtools 0.9.19

* Fixed a bug in `Worker` initialization where the script path was not assigned for remote SSH hosts, causing `runOSCommand()` to fail with NULL argument.

# batchtools 0.9.18

* Fixed CRAN issues with documentation
Expand Down
1 change: 1 addition & 0 deletions R/Worker.R
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ Worker = R6Class("Worker",
if (!testString(script, min.chars = 1L)) {
stopf("Unable to locate helper script on SSH node '%s'. Is batchtools installed on the node?", nodename)
}
self$script = script
}

self$ncpus = ncpus %??% as.integer(private$run("number-of-cpus")$output)
Expand Down
5 changes: 2 additions & 3 deletions R/runOSCommand.R
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,8 @@ runOSCommand = function(sys.cmd, sys.args = character(0L), stdin = "", nodename

if (!isLocalHost(nodename)) {
command = sprintf("%s %s", sys.cmd, stri_flatten(sys.args, " "))
if (getRversion() < "4.0.0") {
command = shQuote(command)
}
# The shQuote'ing appears to be necessary even on R >= 4.5
command = shQuote(command)
command = stri_replace_all_fixed(command, "\\$", "$")
sys.args = c("-q", nodename, command)
sys.cmd = "ssh"
Expand Down
Loading