From 0a019d70087f2bcb03a6d29e0af779368d0bc824 Mon Sep 17 00:00:00 2001 From: David Dorchies <david.dorchies@inrae.fr> Date: Sat, 4 May 2024 08:59:12 +0200 Subject: [PATCH] wip: debugging SIC under wine Refs #5 --- .Rbuildignore | 1 + DESCRIPTION | 1 + R/sic_run_fortran.R | 16 +++++++++++----- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.Rbuildignore b/.Rbuildignore index b69480f..054b8ea 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -6,3 +6,4 @@ [.]INI$ ^\.gitlab-ci\.yml$ ^ci$ +^\.devcontainer$ diff --git a/DESCRIPTION b/DESCRIPTION index 95aa6a4..20f77c3 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -26,4 +26,5 @@ Imports: terra, tidyquery, tidyr, + xfun, xml2 diff --git a/R/sic_run_fortran.R b/R/sic_run_fortran.R index 8a65850..3e7c096 100644 --- a/R/sic_run_fortran.R +++ b/R/sic_run_fortran.R @@ -86,11 +86,17 @@ sic_run_fortran <- function(cfg, prog, params) { type = "cmd2" ) logger::log_debug(cmd_line) - shell( - cmd_line, - wait = T, - translate = T - ) + if (xfun::is_windows()) { + r <- shell( + cmd_line, + wait = T, + translate = T + ) + } else { + r <- system(paste("wine", cmd_line)) + } + attr(r, "cmd_line") <- cmd_line + return(r) } #' @noRd -- GitLab