fix maven download logic

DaemonicLabs · Mar 13, 2021 · af340b6 · af340b6
1 parent bf181d6
commit af340b6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 56 deletions.
diff --git a/.github/workflows/PUSH.yml b/.github/workflows/PUSH.yml
diff --git a/util/maven/src/main/kotlin/voodoo.util/maven/MavenUtil.kt b/util/maven/src/main/kotlin/voodoo.util/maven/MavenUtil.kt
@@ -90,7 +90,6 @@ object MavenUtil : KLogging() {
 
         val artifactUrl = "$mavenUrl/$groupPath/$artifactId/$version/$artifactId-$version$classifierSuffix.$extension"
         logger.trace { "downloading: $artifactUrl" }
-        val tmpFile = File(outputDir, "$artifactId-$version$classifierSuffix.$extension.tmp")
         val targetFile = outputFile ?: File(outputDir, "$artifactId-$version$classifierSuffix.$extension")
         targetFile.absoluteFile.parentFile.mkdirs()
         targetFile.download(
@@ -113,7 +112,7 @@ object MavenUtil : KLogging() {
                         }
                     }
 
-                    val fileSha1 = MessageDigest.getInstance("SHA-1").digest(tmpFile.readBytes()).toHexString()
+                    val fileSha1 = MessageDigest.getInstance("SHA-1").digest(bytes).toHexString()
 //                    require(fileSha1 == sha1) { "$artifactUrl did not match SHA-1 hash: '$sha1'" }
                     fileSha1 == sha1
                 } else {

diff --git a/voodoo/src/main/kotlin/voodoo/cli/UpdateCommand.kt b/voodoo/src/main/kotlin/voodoo/cli/UpdateCommand.kt
@@ -11,6 +11,7 @@ import mu.withLoggingContext
 import voodoo.util.Directories
 import voodoo.util.download
 import voodoo.util.maven.MavenUtil
+import voodoo.util.toHexString
 import voodoo.util.useClient
 import voodoo.voodoo.GeneratedConstants
 import java.io.File
@@ -57,7 +58,7 @@ class UpdateCommand : CliktCommand(
             tmpFile.download(distributionUrl, cacheDir = cacheHome)
             useClient { client ->
                 val md5 = client.get<String>(distributionUrl + ".md5")
-                val fileMd5 = hex(createMD5(tmpFile))
+                val fileMd5 = createMD5(tmpFile).toHexString()
                 require(fileMd5 == md5) { "checksum file ${distributionUrl}.md5 does not match the actual checksum of $distributionUrl" }
             }
 
@@ -71,12 +72,6 @@ class UpdateCommand : CliktCommand(
         }
     }
 
-    private fun toHexString(bytes: ByteArray): String {
-        return buildString {
-            bytes.forEach { b -> append(String.format("%02x", b)) }
-        }
-    }
-
     @Throws(Exception::class)
     fun createMD5(file: File): ByteArray {
         return file.inputStream().use { fis ->