make tarball naming for R CMD check less restrictive

git-svn-id: https://svn.r-project.org/R/trunk@88343 00db46b3-68df-0310-9c12-caf00c1e9a41

Author: ripley

doc/NEWS.Rd

@@ -107,6 +107,10 @@
 
       Where \R is used via extensive \abbr{IDE}s such as \command{RStudio},
       their maintainers may need to adapt \file{R.css} files accordingly.
+
+      \command{R CMD check} when passed a tarballl looks at its contents
+      and so no longer derives the package name from the tarball name
+      (which can now be arbitrary).
     }
   }
 
@@ -162,7 +166,7 @@
   \subsection{UTILITIES}{
     \itemize{
       \item \command{R CMD check} now handles archives with extension
-      \file{.tar} and \file{.tar.zstd} (where \command{zstd} compression
+      \file{.tar} or \file{.tar.zstd} (where \command{zstd} compression
       is supported by the \R build).
     }
   }

src/library/tools/R/check.R

@@ -7551,9 +7551,24 @@ add_dummies <- function(dir, Log)
             if (thispkg_subdirs == "default") thispkg_subdirs <- "no"
         } else if (file.exists(pkg)) {
             is_tar <- TRUE
-            if (thispkg_subdirs == "default") thispkg_subdirs <- "yes-maybe"
-            pkgname0 <- sub("\\.(tar|tar\\.gz|tgz|tar\\.bz2|tar\\.xz|tar\\.zstd)$", "", pkgname0)
-            pkgname0 <- sub("_[0-9.-]*$", "", pkgname0)
+            ## if (thispkg_subdirs == "default") thispkg_subdirs <- "yes-maybe"
+            ## pkgname0 <- sub("\\.(tar|tar\\.gz|tgz|tar\\.bz2|tar\\.xz|tar\\.zstd)$", "", pkgname0)
+            ## pkgname0 <- sub("_[0-9.-]*$", "", pkgname0)
+            ## look at the contents to find the package name
+            contents <- try(
+                utils::untar(pkg, list = TRUE,
+                             tar = Sys.getenv("R_INSTALL_TAR", "internal")))
+            if(inherits(contents, "try-error")) {
+                warning(sQuote(pkg), " is neither a tarball nor a directory, skipping\n",
+                        domain = NA, call. = FALSE, immediate. = TRUE)
+                next
+            }
+            if (length(contents) < 1 || !endsWith(contents[1], "/")) {
+              warning(sQuote(pkg), " does not contain a directory, skipping\n",
+                      domain = NA, call. = FALSE, immediate. = TRUE)
+              next
+            }
+            pkgname0 <- sub("/$", "",  contents[1])
         } else {
             warning(sQuote(pkg), " is neither a file nor directory, skipping\n",
                     domain = NA, call. = FALSE, immediate. = TRUE)

src/library/utils/man/PkgUtils.Rd

@@ -17,10 +17,8 @@
 }
 \arguments{
   \item{pkgdirs}{a list of names of directories with sources of \R
-    add-on packages.  For \code{check} these can also be the filenames of
-    (possibly compressed) \command{tar} archives with extension
-    \file{.tar}, \file{.tar.gz}, \file{.tgz}, \file{.tar.bz2},
-    \file{.tar.xz} or \file{.tar.zstd}.}
+    add-on packages.  For \code{check} these can also be the filepaths of
+    (possibly compressed) \command{tar} archives.}
   \item{options}{further options to control the processing, or for
     obtaining information about usage and version of the utility.}
 }