Skip to content
This repository was archived by the owner on Dec 30, 2022. It is now read-only.

Commit e804339

Browse files
committed
Delete file only on exit
Closes #15 Signed-off-by: DeathsGun <deathsgun@protonmail.com>
1 parent 978018f commit e804339

4 files changed

Lines changed: 4 additions & 30 deletions

File tree

src/main/java/xyz/deathsgun/modmanager/tasks/ModRemovalTask.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,7 @@
2525
import xyz.deathsgun.modmanager.api.manipulation.TaskCallback;
2626
import xyz.deathsgun.modmanager.api.mod.SummarizedMod;
2727
import xyz.deathsgun.modmanager.util.FabricMods;
28-
import xyz.deathsgun.modmanager.util.InstallationUtil;
29-
import xyz.deathsgun.modmanager.util.OS;
3028

31-
import java.nio.file.Files;
3229
import java.nio.file.Path;
3330
import java.util.Optional;
3431

@@ -55,11 +52,8 @@ protected void execute() throws Exception {
5552
if (jar == null) {
5653
throw new Exception(String.format("Couldn't find jar for %s", subject.name()));
5754
}
58-
if (InstallationUtil.getCurrentOS() != OS.WINDOWS) {
59-
Files.delete(jar);
60-
} else {
61-
jar.toFile().deleteOnExit();
62-
}
55+
//TODO: Delete file directly
56+
jar.toFile().deleteOnExit();
6357
ModManager.getModManipulationManager().removeManuallyInstalled(subject);
6458
}
6559

src/main/java/xyz/deathsgun/modmanager/tasks/ModUpdateTask.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@
88
import xyz.deathsgun.modmanager.api.mod.SummarizedMod;
99
import xyz.deathsgun.modmanager.util.FabricMods;
1010
import xyz.deathsgun.modmanager.util.InstallationUtil;
11-
import xyz.deathsgun.modmanager.util.OS;
1211

13-
import java.nio.file.Files;
1412
import java.nio.file.Path;
1513
import java.util.Optional;
1614

@@ -41,11 +39,8 @@ protected void execute() throws Exception {
4139
if (jar == null) {
4240
throw new Exception(String.format("Couldn't find jar for %s", subject.name()));
4341
}
44-
if (InstallationUtil.getCurrentOS() != OS.WINDOWS) {
45-
Files.delete(jar);
46-
} else {
47-
jar.toFile().deleteOnExit();
48-
}
42+
//TODO: Delete file directly
43+
jar.toFile().deleteOnExit();
4944
InstallationUtil.downloadMod(http, InstallationUtil.getVersionForMod(subject));
5045
ModManager.getModManipulationManager().markManuallyUpdated(subject);
5146
ModManager.getUpdateChecker().removeUpdate(subject.id());

src/main/java/xyz/deathsgun/modmanager/util/InstallationUtil.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,4 @@ public static void downloadMod(HttpClient http, ModVersion version) throws Excep
5656
}
5757
}
5858

59-
public static OS getCurrentOS() {
60-
String name = System.getProperty("os.name");
61-
if (name.contains("win")) {
62-
return OS.WINDOWS;
63-
}
64-
return name.contains("mac") ? OS.MACOS : OS.LINUX;
65-
}
66-
6759
}

src/main/java/xyz/deathsgun/modmanager/util/OS.java

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)