Fix short path portability

stan-dev · Jun 6, 2024 · 4927783 · 4927783
1 parent 995e36f
commit 4927783
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 7 deletions.
diff --git a/R/install.R b/R/install.R
@@ -454,7 +454,7 @@ build_cmdstan <- function(dir,
     run_cmd <- make_cmd()
   }
   withr::with_envvar(
-    c("HOME" = utils::shortPathName(Sys.getenv("HOME"))),
+    c("HOME" = short_path(Sys.getenv("HOME"))),
     withr::with_path(
       c(
         toolchain_PATH_env_var(),
@@ -479,7 +479,7 @@ clean_cmdstan <- function(dir = cmdstan_path(),
                           cores = getOption("mc.cores", 2),
                           quiet = FALSE) {
   withr::with_envvar(
-    c("HOME" = utils::shortPathName(Sys.getenv("HOME"))),
+    c("HOME" = short_path(Sys.getenv("HOME"))),
     withr::with_path(
       c(
         toolchain_PATH_env_var(),
@@ -501,7 +501,7 @@ clean_cmdstan <- function(dir = cmdstan_path(),
 
 build_example <- function(dir, cores, quiet, timeout) {
   withr::with_envvar(
-    c("HOME" = utils::shortPathName(Sys.getenv("HOME"))),
+    c("HOME" = short_path(Sys.getenv("HOME"))),
     withr::with_path(
       c(
         toolchain_PATH_env_var(),

diff --git a/R/model.R b/R/model.R
@@ -664,9 +664,9 @@ compile <- function(quiet = TRUE,
     if (compile_standalone) {
       expose_stan_functions(self$functions, !quiet)
     }
-  
+
     withr::with_envvar(
-      c("HOME" = utils::shortPathName(Sys.getenv("HOME"))),
+      c("HOME" = short_path(Sys.getenv("HOME"))),
       withr::with_path(
         c(
           toolchain_PATH_env_var(),

diff --git a/R/run.R b/R/run.R
@@ -411,7 +411,7 @@ check_target_exe <- function(exe) {
   exe_path <- file.path(cmdstan_path(), exe)
   if (!file.exists(exe_path)) {
     withr::with_envvar(
-      c("HOME" = utils::shortPathName(Sys.getenv("HOME"))),
+      c("HOME" = short_path(Sys.getenv("HOME"))),
       withr::with_path(
         c(
           toolchain_PATH_env_var(),

diff --git a/R/utils.R b/R/utils.R
@@ -107,6 +107,14 @@ stanc_cmd <- function() {
 
 # paths and extensions ----------------------------------------------------
 
+short_path <- function(path) {
+  if (os_is_windows()) {
+    utils::shortPathName(path)
+  } else {
+    path
+  }
+}
+
 # Replace `\\` with `/` in a vector of paths
 # Needed for windows if CmdStan version is < 2.21:
 # https://github.com/stan-dev/cmdstanr/issues/1#issuecomment-539118598
@@ -693,7 +701,7 @@ assert_file_exists <- checkmate::makeAssertionFunction(check_file_exists)
 get_cmdstan_flags <- function(flag_name) {
   cmdstan_path <- cmdstanr::cmdstan_path()
   withr::with_envvar(
-    c("HOME" = utils::shortPathName(Sys.getenv("HOME"))),
+    c("HOME" = short_path(Sys.getenv("HOME"))),
     flags <- wsl_compatible_run(
       command = "make",
       args = c("-s", paste0("print-", flag_name)),