Merge pull request #547 from alvasw/gradle_electrum_do_not_package_dm…

…g_file Electrum: Don't package DMG image
bisq-network · Nov 13, 2022 · 54dc352 · 54dc352
2 parents 1a3445a + b19a86b
commit 54dc352
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/...lectrum-binaries/src/main/kotlin/bisq/gradle/electrum/tasks/VerifyElectrumBinariesTask.kt b/...lectrum-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
@@ -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
@@ -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) {