Merge pull request #1126 from 0UmfHxcvx5J7JoaOhFSs5mncnisTJJ6q/fix/#1125

lorenzwalthert · web-flow · commit e8836fdf5c12 · 2023-06-01T11:33:03.000+02:00
fix calculation of temp_dir in delete_if_cache_directory()
diff --git a/R/zzz.R b/R/zzz.R
@@ -38,7 +38,7 @@ delete_if_cache_directory <- function(path) {
   }
   designated_cache_path <- normalizePath(tools::R_user_dir("R.cache", which = "cache"))
   is_in_tools_cache <- startsWith(path, designated_cache_path)
-  temp_dir <- normalizePath(Sys.getenv("TMPDIR", Sys.getenv("TMP")))
+  temp_dir <- normalizePath(dirname(tempdir()))
   is_in_generic_cache <- startsWith(path, temp_dir)
   if (is_in_tools_cache || is_in_generic_cache) {
     all_files <- list.files(path,

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ delete_if_cache_directory <- function(path) {`
`38`	`38`	`}`
`39`	`39`	`designated_cache_path <- normalizePath(tools::R_user_dir("R.cache", which = "cache"))`
`40`	`40`	`is_in_tools_cache <- startsWith(path, designated_cache_path)`
`41`		`- temp_dir <- normalizePath(Sys.getenv("TMPDIR", Sys.getenv("TMP")))`
	`41`	`+ temp_dir <- normalizePath(dirname(tempdir()))`
`42`	`42`	`is_in_generic_cache <- startsWith(path, temp_dir)`
`43`	`43`	`if (is_in_tools_cache \|\| is_in_generic_cache) {`
`44`	`44`	`all_files <- list.files(path,`