Implement own version of unzip.

Closes #540

NEWS.md

@@ -84,6 +84,9 @@
   parameters `auth_user`, `branch`, `pull` and `password` have all been 
   removed.
 
+* Implemented own version `utils::unzip()` that throws error if command
+  fails and doesn't print unneeded messages on non-Windows platforms (#540).
+
 # devtools 1.5
 
 Four new functions make it easier to add useful infrastructure to packages:

R/decompress.r

@@ -2,7 +2,7 @@ decompress <- function(src, target) {
   stopifnot(file.exists(src))
 
   if (grepl("\\.zip$", src)) {
-    unzip(src, exdir = target, unzip = getOption("unzip"))
+    my_unzip(src, target)
     outdir <- getrootdir(as.vector(unzip(src, list = TRUE)$Name))
 
   } else if (grepl("\\.tar$", src)) {
@@ -32,8 +32,21 @@ decompress <- function(src, target) {
 # getdir("path/to/dir/") returns "path/to/dir"
 getdir <- function(path)  sub("/[^/]*$", "", path)
 
-# Given a list of files, returns the root (the topmost folder) 
+# Given a list of files, returns the root (the topmost folder)
 # getrootdir(c("path/to/file", "path/to/other/thing")) returns "path/to"
 getrootdir <- function(file_list) {
   getdir(file_list[which.min(nchar(gsub("[^/]", "", file_list)))])
 }
+
+my_unzip <- function(src, target, unzip = getOption("unzip")) {
+  if (unzip == "internal") {
+    unzip(src, exdir = target)
+  }
+
+  args <- paste(
+    "-oq", shQuote(src),
+    "-d", shQuote(target)
+  )
+
+  system_check(unzip, args, quiet = TRUE)
+}

R/install-local.r

@@ -47,7 +47,7 @@ install_local_single <- function(path, subdir = NULL, before_install = NULL, ...
   if (file.exists(config_path)) {
     Sys.chmod(config_path, "777")
   }
-  
+
   # Call before_install for bundles (if provided)
   if (!is.null(bundle) && !is.null(before_install))
     before_install(bundle, pkg_path)

R/with.r

@@ -47,6 +47,8 @@ is.named <- function(x) {
 # env ------------------------------------------------------------------------
 
 set_envvar <- function(envs, action = "replace") {
+  if (length(envs) == 0) return()
+
   stopifnot(is.named(envs))
   stopifnot(is.character(action), length(action) == 1)
   action <- match.arg(action, c("replace", "prefix", "suffix"))