Improve messaging for install packages

r-devel · Feb 21, 2025 · 5aa1d99 · 5aa1d99
1 parent 4d63f3f
commit 5aa1d99
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/src/library/utils/R/unix/mac.install.R b/src/library/utils/R/unix/mac.install.R
@@ -179,10 +179,11 @@ if(!startsWith(R.version$os, "darwin")) {
                     unpackPkg(foundpkgs[okp, 2L], foundpkgs[okp, 1L], lib,
                               lock = lock)
             }
+            if(!quiet && sum(oklib)){
+                cat("\n", gettextf("Successfully installed %d binary packages in\n\t%s", 
+                    sum(oklib), lib), "\n", sep = "")
+            }
         }
-        if(!quiet && !is.null(tmpd) && is.null(destdir))
-            cat("\n", gettextf("The downloaded binary packages are in\n\t%s", tmpd),
-                "\n", sep = "")
     } else if(!is.null(tmpd) && is.null(destdir)) unlink(tmpd, recursive = TRUE)
 
     invisible()

diff --git a/src/library/utils/R/windows/install.packages.R b/src/library/utils/R/windows/install.packages.R
@@ -274,12 +274,11 @@ unpackPkgZip <- function(pkg, pkgname, lib, libs_only = FALSE,
                     unpackPkgZip(foundpkgs[okp, 2L], foundpkgs[okp, 1L],
                                  lib, libs_only, lock)
             }
+            if(!quiet && sum(oklib)){
+                cat("\n", gettextf("Successfully installed %d binary packages in\n\t%s", 
+                    sum(oklib), normalizePath(lib, mustWork = FALSE)), "\n", sep = "")
+            }
         }
-        if(!quiet && !is.null(tmpd) && is.null(destdir))
-            ## tends to be a long path on Windows
-            cat("\n", gettextf("The downloaded binary packages are in\n\t%s",
-                               normalizePath(tmpd, mustWork = FALSE)),
-                "\n", sep = "")
     } else if(!is.null(tmpd) && is.null(destdir)) unlink(tmpd, recursive = TRUE)
 
     invisible()

diff --git a/src/modules/internet/internet.c b/src/modules/internet/internet.c
@@ -417,7 +417,7 @@ static SEXP in_do_download(SEXP args)
 	}
 
 	R_Busy(1);
-	if(!quiet) REprintf(_("trying URL '%s'\n"), url);
+	if(!quiet) REprintf(_("Downloading '%s'\n"), url);
 	SEXP agentFun, sagent;
 	R_FlushConsole();
 	agentFun = PROTECT(lang2(install("makeUserAgent"), ScalarLogical(0)));

diff --git a/src/modules/internet/libcurl.c b/src/modules/internet/libcurl.c
@@ -787,7 +787,7 @@ static int download_add_url(int i, SEXP scmd, const char *mode,
        curl_easy_setopt(hnd[i], CURLOPT_ACCEPT_ENCODING, "gzip, deflate");
     */
 
-    if (!quiet) REprintf(_("trying URL '%s'\n"), url);
+    if (!quiet) REprintf(_("Downloading '%s'\n"), url);
     vmaxset(vmax);
     return 0;
 }