better unvendor approach

Author: pachadotdev

R/unvendor.R

@@ -15,37 +15,45 @@
 #' vendor(dir)
 #'
 #' # unvendor the cpp4r headers from the directory
-#' unvendor()
+#' unvendor(dir)
 #'
 #' # cleanup
 #' unlink(dir, recursive = TRUE)
 unvendor <- function(path = "./src/vendor") {
-  # Find the vendoring info file
-  info_files <- list.files(path, pattern = "00-cpp4r-vendoring-info.txt", recursive = TRUE, full.names = TRUE)
-
-  if (length(info_files) != 1L) {
+  # Check if the cpp4r directory exists
+  cpp4r_dir <- file.path(path, "cpp4r")
+  cpp4r_hpp_path <- file.path(path, "cpp4r.hpp")
+  info_file_path <- file.path(path, "00-cpp4r-vendoring-info.txt")
+  
+  # Check if vendored files exist
+  has_cpp4r_dir <- dir.exists(cpp4r_dir)
+  has_cpp4r_hpp <- file.exists(cpp4r_hpp_path)
+  has_info_file <- file.exists(info_file_path)
+  
+  if (!has_cpp4r_dir && !has_cpp4r_hpp && !has_info_file) {
     if (is_interactive()) { message("Could not find vendored headers") }
     return(invisible(NULL))
   }
-
-  # The info file is in the cpp4r directory, so dirname(info_files) gives us the cpp4r directory
-  cpp4r_dir <- dirname(info_files)
-  # The parent of the cpp4r directory is where cpp4r.hpp should be
-  parent_dir <- dirname(cpp4r_dir)
 
-  # Remove the cpp4r directory
-  unlink(cpp4r_dir, recursive = TRUE)
+  # Remove the cpp4r directory if it exists
+  if (has_cpp4r_dir) {
+    unlink(cpp4r_dir, recursive = TRUE)
+  }
 
-  # Remove cpp4r.hpp from the parent directory
-  cpp4r_hpp_path <- file.path(parent_dir, "cpp4r.hpp")
-  if (file.exists(cpp4r_hpp_path)) {
+  # Remove cpp4r.hpp if it exists
+  if (has_cpp4r_hpp) {
     unlink(cpp4r_hpp_path)
   }
+  
+  # Remove the info file if it exists
+  if (has_info_file) {
+    unlink(info_file_path)
+  }
 
   if (is_interactive()) {
-    message("Unvendored cpp4r from '", parent_dir, "'")
+    message("Unvendored cpp4r from '", path, "'")
     message("DESCRIPTION should link to cpp4r (e.g., 'LinkingTo: cpp4r')")
   }
 
-  invisible(parent_dir)
+  invisible(path)
 }