fix exception on update, try to have wrapper update again

DaemonicLabs · Mar 14, 2021 · e40e46e · e40e46e
1 parent 973e23c
commit e40e46e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 15 deletions.
diff --git a/samples/wrapper/wrapper.properties b/samples/wrapper/wrapper.properties
@@ -1,4 +1,4 @@
 #generated by: voodoo generateWrapper
-#Sun Mar 14 14:47:49 CET 2021
+#Sun Mar 14 14:54:37 CET 2021
 distributionPath=wrapper/bin
-distributionUrl=https\://nikky.moe/maven/moe/nikky/voodoo/voodoo/0.6.0-81/voodoo-0.6.0-81-all.jar
+distributionUrl=https\://nikky.moe/maven/moe/nikky/voodoo/voodoo/0.6.0-82/voodoo-0.6.0-82-all.jar
diff --git a/voodoo/src/main/kotlin/voodoo/cli/UpdateCommand.kt b/voodoo/src/main/kotlin/voodoo/cli/UpdateCommand.kt
@@ -55,6 +55,7 @@ class UpdateCommand : CliktCommand(
 
             // validate the file exists and matches checksum
             val tmpFile = cacheHome.resolve(distributionUrl.substringAfterLast("/"))
+            tmpFile.delete()
             tmpFile.download(distributionUrl, cacheDir = cacheHome)
             useClient { client ->
                 val md5 = client.get<String>(distributionUrl + ".md5")
@@ -71,19 +72,19 @@ class UpdateCommand : CliktCommand(
             }
 
             //TODO: figure out how to update the wrapper.jar
-//            //  download wrapper -> wrapper/wrapper.jar
-//            val wrapperFile = rootDir.resolve("wrapper/wrapper.jar")
-//            wrapperFile.absoluteFile.parentFile.mkdirs()
-//
-//            MavenUtil.downloadArtifact(
-//                GeneratedConstants.MAVEN_URL,
-//                GeneratedConstants.MAVEN_GROUP,
-//                "wrapper",
-//                GeneratedConstants.FULL_VERSION,
-//                outputFile = wrapperFile,
-//                outputDir = wrapperFile.absoluteFile.parentFile,
-//                classifier = GeneratedConstants.MAVEN_SHADOW_CLASSIFIER
-//            )
+            //  download wrapper -> wrapper/wrapper.jar
+            val wrapperFile = rootDir.resolve("wrapper/wrapper.jar")
+            wrapperFile.absoluteFile.parentFile.mkdirs()
+
+            MavenUtil.downloadArtifact(
+                GeneratedConstants.MAVEN_URL,
+                GeneratedConstants.MAVEN_GROUP,
+                "wrapper",
+                GeneratedConstants.FULL_VERSION,
+                outputFile = wrapperFile,
+                outputDir = wrapperFile.absoluteFile.parentFile,
+                classifier = GeneratedConstants.MAVEN_SHADOW_CLASSIFIER
+            )
         }
     }