Explain also why custom .Renviron.d/ and .Rprofile.d/ files are skipped

DESCRIPTION

@@ -1,5 +1,5 @@
 Package: startup
-Version: 0.22.0-9001
+Version: 0.22.0-9002
 Title: Friendly R Startup Configuration
 Depends: R (>= 2.14.0)
 Suggests: commonmark, tools, tcltk

NEWS.md

@@ -3,7 +3,7 @@
 ## New Features
 
  * `startup(debug = TRUE)` does a better job explaining why certain
-   Renviron and Rprofile files have been skipped.
+   Renviron and Rprofile files are skipped.
 
 
 # Version 0.22.0 (2024-07-29)

R/renviron_d.R

@@ -8,15 +8,23 @@ renviron_d <- function(sibling = FALSE, all = FALSE, unload = FALSE, skip = NA,
                        dryrun = NA, debug = NA, paths = NULL) {
   debug(debug)
 
-  ## Skip?
+  # (i) Find custom .Renviron.d/* files
+  if (is.null(paths)) paths <- find_renviron_d(sibling = sibling, all = all)
+
+  # (ii) Filter and source custom .Renviron.d/* files
+  files <- list_d_files(paths, filter = filter_files)    
+
   if (is.na(skip)) {
     skip <- any(c("--no-environ", "--vanilla") %in% commandArgs())
+    if (skip) {
+      logf(" - Skipping %d .Renviron.d/* files, because R was launched with command-line option %s", length(files), paste(intersect(c("--no-environ", "--vanilla"), commandArgs()), collapse = " "))
+    }
+  } else if (skip) {
+    logf(" - Skipping %d .Renviron.d/* files because skip = TRUE", length(files))
   }
 
   if (!skip) {
     # Load custom .Renviron.d/* files
-    if (is.null(paths)) paths <- find_renviron_d(sibling = sibling, all = all)
-    files <- list_d_files(paths, filter = filter_files)    
     files_apply(files, fun = readRenviron,
                 dryrun = dryrun, what = "Renviron",
                 debug = debug)

R/rprofile_d.R

@@ -14,22 +14,30 @@ rprofile_d <- function(sibling = FALSE, all = FALSE, check = NA,
     check <- isTRUE(getOption("startup.check", check))
   }
 
-  ## Skip?
-  if (is.na(skip)) {
-    skip <- any(c("--no-init-file", "--vanilla") %in% commandArgs())
-  }
-
   # (i) Check and fix common errors
   if (check) {
     check(all = all, fix = TRUE, debug = FALSE)
   }
 
   debug(debug)
 
+  # (ii) Find custom .Rprofile.d/* files
+  if (is.null(paths)) paths <- find_rprofile_d(sibling = sibling, all = all)
+
+  # (iii) Filter and source custom .Rprofile.d/* files
+  files <- list_d_files(paths, filter = filter_files)
+
+  if (is.na(skip)) {
+    skip <- any(c("--no-init-file", "--vanilla") %in% commandArgs())
+    if (skip) {
+      logf(" - Skipping %d .Rprofile.d/* scripts, because R was launched with command-line option %s", length(files), paste(intersect(c("--no-init-file", "--vanilla"), commandArgs()), collapse = " "))
+    }
+  } else if (skip) {
+    logf(" - Skipping %d .Rprofile.d/* scripts because skip = TRUE", length(files))
+  }
+
+  ## Skip?
   if (!skip) {
-    # (ii) Source custom .Rprofile.d/* files
-    if (is.null(paths)) paths <- find_rprofile_d(sibling = sibling, all = all)
-    files <- list_d_files(paths, filter = filter_files)
     encoding <- getOption("encoding")
     keep_source <- getOption("keep.source", TRUE)