fix when phase reboot is used via old jar

DaemonicLabs · Aug 1, 2021 · 636177e · 636177e
1 parent 8767277
commit 636177e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/multimc/installer/src/main/kotlin/voodoo/multimc/InstallMultiMCCommand.kt b/multimc/installer/src/main/kotlin/voodoo/multimc/InstallMultiMCCommand.kt
@@ -44,5 +44,5 @@ class InstallMultiMCCommand: CliktCommand(
 }
 
 enum class Phase {
-    PRE, POST
+    PRE, POST, REBOOT
 }
diff --git a/multimc/installer/src/main/kotlin/voodoo/multimc/Installer.kt b/multimc/installer/src/main/kotlin/voodoo/multimc/Installer.kt
@@ -74,7 +74,7 @@ object Installer {
                 currentJarFile.copyTo(voodooFolder.resolve("multimc-installer.jar"), overwrite = true)
                 exitProcess(0)
             }
-            Phase.PRE -> {
+            Phase.PRE, Phase.REBOOT -> {
                 // always copy current jar to post.jar
                 val postFile = voodooFolder.resolve("post.jar")
                 if(postFile.exists()) {
@@ -106,7 +106,8 @@ object Installer {
                 } else {
                     postFile.download(installerUrl, cacheHome)
                 }
-                val newFile = cacheHome.resolve("tmp.jar")
+                val newFile = cacheHome.resolve("tmp-${newSha256}.jar")
+                newFile.delete()
                 postFile.copyTo(newFile, overwrite = true)
                 return newFile
             }
@@ -228,7 +229,10 @@ object Installer {
                 "--mc",
                 minecraftDir.path,
                 "--phase",
-                phase.toString()
+                when(phase) {
+                    Phase.REBOOT -> Phase.PRE
+                    else -> phase
+                }.toString()
             )
 
             logger.info { "Executing ${args.joinToString()}" }