From b19a86bb29b2057bd25b9d2ab017160e717abdb7 Mon Sep 17 00:00:00 2001 From: Alva Swanson Date: Sun, 13 Nov 2022 23:14:57 +0100 Subject: [PATCH] Electrum: Don't package DMG image --- .../gradle/electrum/tasks/VerifyElectrumBinariesTask.kt | 6 ++++-- .../java/bisq/wallets/electrum/ElectrumBinaryExtractor.java | 1 - .../bisq/wallets/electrum/ElectrumBinaryExtractorTest.java | 1 - 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build-logic/electrum-binaries/src/main/kotlin/bisq/gradle/electrum/tasks/VerifyElectrumBinariesTask.kt b/build-logic/electrum-binaries/src/main/kotlin/bisq/gradle/electrum/tasks/VerifyElectrumBinariesTask.kt index 19c36e9e5f..399e258a56 100644 --- a/build-logic/electrum-binaries/src/main/kotlin/bisq/gradle/electrum/tasks/VerifyElectrumBinariesTask.kt +++ b/build-logic/electrum-binaries/src/main/kotlin/bisq/gradle/electrum/tasks/VerifyElectrumBinariesTask.kt @@ -48,8 +48,10 @@ abstract class VerifyElectrumBinariesTask : DefaultTask() { throw GradleException("Signature verification failed for $filename.") } - val targetPath = outputDir.resolve(filename).toPath() - Files.move(fileToVerify.toPath(), targetPath, StandardCopyOption.REPLACE_EXISTING) + if (!filename.endsWith(".dmg")) { + val targetPath = outputDir.resolve(filename).toPath() + Files.move(fileToVerify.toPath(), targetPath, StandardCopyOption.REPLACE_EXISTING) + } } } diff --git a/wallets/electrum/src/main/java/bisq/wallets/electrum/ElectrumBinaryExtractor.java b/wallets/electrum/src/main/java/bisq/wallets/electrum/ElectrumBinaryExtractor.java index 5ea125301a..3360ec244a 100644 --- a/wallets/electrum/src/main/java/bisq/wallets/electrum/ElectrumBinaryExtractor.java +++ b/wallets/electrum/src/main/java/bisq/wallets/electrum/ElectrumBinaryExtractor.java @@ -30,7 +30,6 @@ public class ElectrumBinaryExtractor { public static final String LINUX_BINARY_SUFFIX = "AppImage"; - public static final String MAC_OS_BINARY_SUFFIX = "dmg"; public static final String WINDOWS_BINARY_SUFFIX = "exe"; private static final String ARCHIVE_FILENAME = "electrum-binaries.zip"; diff --git a/wallets/electrum/src/test/java/bisq/wallets/electrum/ElectrumBinaryExtractorTest.java b/wallets/electrum/src/test/java/bisq/wallets/electrum/ElectrumBinaryExtractorTest.java index c51bd90d85..ccb761d05d 100644 --- a/wallets/electrum/src/test/java/bisq/wallets/electrum/ElectrumBinaryExtractorTest.java +++ b/wallets/electrum/src/test/java/bisq/wallets/electrum/ElectrumBinaryExtractorTest.java @@ -38,7 +38,6 @@ public ElectrumBinaryExtractorTest() throws IOException { @ParameterizedTest @ValueSource(strings = { ElectrumBinaryExtractor.LINUX_BINARY_SUFFIX, - ElectrumBinaryExtractor.MAC_OS_BINARY_SUFFIX, ElectrumBinaryExtractor.WINDOWS_BINARY_SUFFIX }) void extractBinaries(String binarySuffix) {