download: use zip package to create archives. As the zip package is p…

…latform independent there is no longer the requirement to install Rtools on windows.
loosolab · Oct 16, 2019 · 48443ca · 48443ca
1 parent b315802
commit 48443ca
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -46,7 +46,8 @@ Imports: shiny,
     openssl,
     methods,
     R6,
-    magrittr
+    magrittr,
+    zip
 RoxygenNote: 6.1.1
 biocViews: 
 Suggests: knitr,

diff --git a/R/function.R b/R/function.R
@@ -1207,7 +1207,7 @@ searchData <- function(input, choices, options = c("=", "<", ">"), min. = min(ch
 #' @param save_plot Logical if plot object should be saved as .RData.
 #' @param ui List of user inputs. Will be converted to JavaScript Object Notation. See \code{\link[RJSONIO]{toJSON}}
 #'
-#' @return See \code{\link[utils]{zip}}.
+#' @return Path to zip archive. See \code{\link[zip]{zipr}}.
 download <- function(file, filename, plot, width, height, ppi = 72, save_plot = TRUE, ui = NULL) {
   session <- shiny::getDefaultReactiveDomain()
 
@@ -1289,7 +1289,7 @@ download <- function(file, filename, plot, width, height, ppi = 72, save_plot =
   }
 
   # create zip file
-  out <- utils::zip(zipfile = file, files = files, flags = "-j") # discard file path
+  out <- zip::zipr(zipfile = file, files = files, include_directories = FALSE)
 
   # remove tmp files
   file.remove(files)