Merge pull request #62 from enriquemondragon/java_download_argument

Closes #61 Check MD5 regardless of quiet flag value

Author: e-kotov

R/java_download.R

@@ -32,6 +32,29 @@ java_download <- function(
   temp_dir = FALSE
 ) {
 
+  # Download distribution and check MD5 checksum
+  download_dist_check_md5 <- function(url, dest_file, quiet) {
+
+    curl::curl_download(url, dest_file, quiet = FALSE)
+    curl::curl_download(url_md5, dest_file_md5, quiet = TRUE)
+
+    if (!quiet) {
+      cli::cli_inform("Download completed.", .envir = environment())
+    }
+    md5sum <- tools::md5sum(dest_file)
+    md5sum_expected <- readLines(dest_file_md5, warn = FALSE)
+
+    if (md5sum != md5sum_expected) {
+      cli::cli_abort("MD5 checksum mismatch. Please try downloading the file again.", .envir = environment())
+      unlink(dest_file)
+      return(NULL)
+    } else {
+      if (!quiet) {
+        cli::cli_inform("MD5 checksum verified.", .envir = environment())
+      }
+    }
+  }
+
   # override cache_path if temp_dir is set to TRUE
   if (temp_dir) {
     temp_dir <- tempdir()
@@ -96,7 +119,6 @@ java_download <- function(
   dest_file <- file.path(cache_path, basename(url))
   dest_file_md5 <- paste0(file.path(cache_path, basename(url_md5)), ".md5")
 
-
   if (!quiet) {
     cli::cli_inform("Downloading Java {version} ({distribution}) for {platform} {arch} to {dest_file}", .envir = environment())
   }
@@ -105,44 +127,14 @@ java_download <- function(
     if (!quiet) {
       cli::cli_inform("File already exists. Skipping download.", .envir = environment())
     }
-  } else if(file.exists(dest_file) & force){
+  } else if(file.exists(dest_file) & force) {
     if (!quiet) {
       cli::cli_inform("Removing existing installation.", .envir = environment())
-    }
-    file.remove(dest_file)
-    curl::curl_download(url, dest_file, quiet = FALSE)
-    curl::curl_download(url_md5, dest_file_md5, quiet = TRUE)
-    if (!quiet) {
-      cli::cli_inform("Download completed.", .envir = environment())
-
-      md5sum <- tools::md5sum(dest_file)
-      md5sum_expected <- readLines(dest_file_md5, warn = FALSE)
-
-      if (md5sum != md5sum_expected) {
-        cli::cli_alert_danger("MD5 checksum mismatch. Please try downloading the file again.", .envir = environment())
-        unlink(dest_file)
-        return(NULL)
-      } else {
-        cli::cli_inform("MD5 checksum verified.", .envir = environment())
-      }
-    }
-  } else if (!file.exists(dest_file)){
-    curl::curl_download(url, dest_file, quiet = FALSE)
-    curl::curl_download(url_md5, dest_file_md5, quiet = TRUE)
-    if (!quiet) {
-      cli::cli_inform("Download completed.", .envir = environment())
-
-      md5sum <- tools::md5sum(dest_file)
-      md5sum_expected <- readLines(dest_file_md5, warn = FALSE)
-
-      if (md5sum != md5sum_expected) {
-        cli::cli_alert_danger("MD5 checksum mismatch. Please try downloading the file again.", .envir = environment())
-        unlink(dest_file)
-        return(NULL)
-      } else {
-        cli::cli_inform("MD5 checksum verified.", .envir = environment())
       }
-    }
+    file.remove(dest_file)
+    download_dist_check_md5(url, dest_file, quiet)
+  } else if (!file.exists(dest_file)) {
+    download_dist_check_md5(url, dest_file, quiet)
   }
 
   return(dest_file)