Merge pull request #455 from PredictiveEcology/makeRelative

makeRelative --> tweaks for Mac

Author: eliotmcintire

.vscode/extensions.json

@@ -18,8 +18,8 @@ SystemRequirements: 'unrar' (Linux/macOS) or '7-Zip' (Windows) to work with '.ra
 URL: 
     https://reproducible.predictiveecology.org,
     https://github.com/PredictiveEcology/reproducible
-Date: 2025-12-11
-Version: 2.1.3.9000
+Date: 2025-12-16
+Version: 2.1.3.9001
 Authors@R: 
     c(person(given = "Eliot J B",
              family = "McIntire",

.vscode/settings.json

@@ -370,16 +370,13 @@ makeRelative <- function(files, absoluteBase) {
   if (length(files)) {
     areAbs <- isAbsolutePath(files)
     if (any(areAbs)) {
+      files[areAbs] <- normPath(files[areAbs])
       absoluteBase <- normPath(absoluteBase) # can be "." which means 'any character' in a grep
       if (length(absoluteBase) < length(files))
         absoluteBase <- rep(absoluteBase, length.out = length(files))
       files[areAbs] <- unlist(Map(ab = absoluteBase[areAbs], file = files[areAbs], function(ab, file)
         gsub(paste0("^", ab, "/{0,1}"), "", file)
       ))
-      # files[areAbs] <- gsub(paste0("^", absoluteBase, "/{0,1}"), "", files[areAbs])
-
-      # this does dumb things when it is not relative ... i.e., with prepend ../../../../../..
-      # files[areAbs] <- fs::path_rel(start = absoluteBase, files[areAbs])
     }
   }
   if (length(files)) {

DESCRIPTION

@@ -1529,7 +1529,10 @@ test_that("lightweight tests 2 for code coverage", {
   })
 
   expect_error(extractFromArchive(theZapFile), "Archives of type zap are not currently supported")
-  expect_error(extractFromArchive(theZipName), "No archive exists with filename")
+  oo <- capture.output(
+    type = "message",
+    expect_error(extractFromArchive(theZipName), "No archive exists with filename")
+  )
 
   extractFromArchive(theZipFile, neededFiles = character())
 
@@ -1547,14 +1550,15 @@ test_that("lightweight tests 2 for code coverage", {
   # check Checksums fn
 
   expect_error(
+    oo <- capture.output(type = "message",
     suppressWarnings(extractFromArchive(
       theZipFile,
       neededFiles = character(),
       checkSumFilePath = theRDSFile,
       destinationPath = tmpdir
     )),
     "checkSumFilePath is not a CHECKSUMS.txt"
-  )
+  ))
 
   # Doubley nested zips -- extract inner, inner
   a <- extractFromArchive(