Skip to content

Commit 982c5f3

Browse files
Check MD5 regardless of quiet flag value
1 parent 5b9a68d commit 982c5f3

File tree

1 file changed

+18
-32
lines changed

1 file changed

+18
-32
lines changed

R/java_download.R

Lines changed: 18 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -105,42 +105,28 @@ java_download <- function(
105105
if (!quiet) {
106106
cli::cli_inform("File already exists. Skipping download.", .envir = environment())
107107
}
108-
} else if(file.exists(dest_file) & force){
109-
if (!quiet) {
110-
cli::cli_inform("Removing existing installation.", .envir = environment())
111-
}
112-
file.remove(dest_file)
113-
curl::curl_download(url, dest_file, quiet = FALSE)
114-
curl::curl_download(url_md5, dest_file_md5, quiet = TRUE)
115-
if (!quiet) {
116-
cli::cli_inform("Download completed.", .envir = environment())
117-
118-
md5sum <- tools::md5sum(dest_file)
119-
md5sum_expected <- readLines(dest_file_md5, warn = FALSE)
120-
121-
if (md5sum != md5sum_expected) {
122-
cli::cli_alert_danger("MD5 checksum mismatch. Please try downloading the file again.", .envir = environment())
123-
unlink(dest_file)
124-
return(NULL)
125-
} else {
126-
cli::cli_inform("MD5 checksum verified.", .envir = environment())
108+
} else if(file.exists(dest_file)) {
109+
if (force) {
110+
if (!quiet) {
111+
cli::cli_inform("Removing existing installation.", .envir = environment())
127112
}
113+
file.remove(dest_file)
114+
curl::curl_download(url, dest_file, quiet = FALSE)
115+
curl::curl_download(url_md5, dest_file_md5, quiet = TRUE)
128116
}
129-
} else if (!file.exists(dest_file)){
130-
curl::curl_download(url, dest_file, quiet = FALSE)
131-
curl::curl_download(url_md5, dest_file_md5, quiet = TRUE)
132117
if (!quiet) {
133118
cli::cli_inform("Download completed.", .envir = environment())
134-
135-
md5sum <- tools::md5sum(dest_file)
136-
md5sum_expected <- readLines(dest_file_md5, warn = FALSE)
137-
138-
if (md5sum != md5sum_expected) {
139-
cli::cli_alert_danger("MD5 checksum mismatch. Please try downloading the file again.", .envir = environment())
140-
unlink(dest_file)
141-
return(NULL)
142-
} else {
143-
cli::cli_inform("MD5 checksum verified.", .envir = environment())
119+
}
120+
md5sum <- tools::md5sum(dest_file)
121+
md5sum_expected <- readLines(dest_file_md5, warn = FALSE)
122+
123+
if (md5sum != md5sum_expected) {
124+
cli::cli_alert_danger("MD5 checksum mismatch. Please try downloading the file again.", .envir = environment())
125+
unlink(dest_file)
126+
return(NULL)
127+
} else {
128+
if (!quiet) {
129+
cli::cli_inform("MD5 checksum verified.", .envir = environment())
144130
}
145131
}
146132
}

0 commit comments

Comments
 (0)