Skip to content

Commit d567b4c

Browse files
authored
Revert "Fixed hash logic on macOS (#82)" (#87)
This reverts commit 62e3295.
1 parent 56e5e26 commit d567b4c

1 file changed

Lines changed: 6 additions & 5 deletions

File tree

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -117,21 +117,22 @@ public CompletableFuture<Pair<Boolean, String>> isUptoDate() {
117117
for (int i = 0; i < 4; i++) {
118118
Modflared.LOGGER.info("Downloading cloudflared version {} from github. Attempt: {}", version, i + 1);
119119
var downloadedFile = syncDownloadFile();
120+
Modflared.LOGGER.info("Downloaded file preparing cloudflared binary...");
120121
var file = new File(TunnelManager.DATA_FOLDER, download.fileName());
122+
prepareFile(downloadedFile, file);
123+
121124
// Check if file is corrupt
122125
Modflared.LOGGER.info("Checking file integrity");
123-
var provided = GithubAPI.FileHash.computeHash(downloadedFile);
126+
var provided = GithubAPI.FileHash.computeHash(file);
124127
if(expected.compareTo(provided)) {
125128
Modflared.LOGGER.info("Download finished of cloudflared version {}!", version);
126-
Modflared.LOGGER.info("Downloaded file preparing cloudflared binary...");
127-
prepareFile(downloadedFile, file);
128129
return;
129130
} else {
130131
Modflared.LOGGER.warn("This downloaded file does not match with the file hash provided on GitHub.");
131132
Modflared.LOGGER.warn("Expected {}, Provided: {}", expected.hash(), provided.hash());
132-
downloadedFile.delete();
133-
}
134133

134+
file.delete();
135+
}
135136
}
136137
} catch (InterruptedException exception) {
137138
throw new IllegalStateException("Error while unpacking MacOS cloudflared download", exception);

0 commit comments

Comments
 (0)