Skip to content

Commit 02c6415

Browse files
committed
Merge branch 'multi/1.21.8' into multi/1.21.9
2 parents b2b271c + a01b7e7 commit 02c6415

1 file changed

Lines changed: 5 additions & 6 deletions

File tree

common/src/main/java/de/rafael/modflared/binary/download/DownloadedCloudflared.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -125,22 +125,21 @@ public CompletableFuture<Pair<Boolean, String>> isUptoDate() {
125125
for (int i = 0; i < 4; i++) {
126126
Modflared.LOGGER.info("Downloading cloudflared version {} from github. Attempt: {}", version, i + 1);
127127
var downloadedFile = syncDownloadFile();
128-
Modflared.LOGGER.info("Downloaded file preparing cloudflared binary...");
129128
var file = new File(TunnelManager.DATA_FOLDER, download.fileName());
130-
prepareFile(downloadedFile, file);
131-
132129
// Check if file is corrupt
133130
Modflared.LOGGER.info("Checking file integrity");
134-
var provided = GithubAPI.FileHash.computeHash(file);
131+
var provided = GithubAPI.FileHash.computeHash(downloadedFile);
135132
if(expected.compareTo(provided)) {
136133
Modflared.LOGGER.info("Download finished of cloudflared version {}!", version);
134+
Modflared.LOGGER.info("Downloaded file preparing cloudflared binary...");
135+
prepareFile(downloadedFile, file);
137136
return;
138137
} else {
139138
Modflared.LOGGER.warn("This downloaded file does not match with the file hash provided on GitHub.");
140139
Modflared.LOGGER.warn("Expected {}, Provided: {}", expected.hash(), provided.hash());
141-
142-
file.delete();
140+
downloadedFile.delete();
143141
}
142+
144143
}
145144
} catch (InterruptedException exception) {
146145
throw new IllegalStateException("Error while unpacking MacOS cloudflared download", exception);

0 commit comments

Comments
 (0)