Lanmikeman/Launcher
1
1
Fork 0
mirror of https://github.com/GravitLauncher/Launcher synced 2025-04-18 22:13:04 +03:00
Code Issues Projects Releases Packages Wiki Activity

[FIX] IOHelper.move нормально работает на linux.

Browse source
This commit is contained in:
Zaxar163 2020-04-16 20:05:59 +03:00
parent de01dda23d
commit 8d4473d5a3
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
LaunchServer/src/main/java/pro/gravit/launchserver/launchermodules/LauncherModuleLoader.java
View file

@ -27,18 +27,17 @@
public class LauncherModuleLoader { public class LauncherModuleLoader {
public final List<ModuleEntity> launcherModules = new ArrayList<>(); public final List<ModuleEntity> launcherModules = new ArrayList<>();
public Path modules_dir; public final Path modulesDir;
private transient LaunchServer server; private final LaunchServer server;
public LauncherModuleLoader(LaunchServer server) { public LauncherModuleLoader(LaunchServer server) {
this.server = server; this.server = server; modulesDir = server.dir.resolve("launcher-modules");
} }
public void init() { public void init() {
modules_dir = server.dir.resolve("launcher-modules"); if (!IOHelper.isDir(modulesDir)) {
if (!IOHelper.isDir(modules_dir)) {
try { try {
Files.createDirectories(modules_dir); Files.createDirectories(modulesDir);
} catch (IOException e) { } catch (IOException e) {
LogHelper.error(e); LogHelper.error(e);
} }
@ -67,7 +66,7 @@ public void init() {
public void syncModules() throws IOException { public void syncModules() throws IOException {
launcherModules.clear(); launcherModules.clear();
IOHelper.walk(modules_dir, new ModulesVisitor(), false); IOHelper.walk(modulesDir, new ModulesVisitor(), false);
} }
static class ModuleEntity { static class ModuleEntity {

2
LauncherCore/src/main/java/pro/gravit/utils/helper/IOHelper.java
View file

@ -602,7 +602,7 @@ public FileVisitResult visitFileFailed(Path file, IOException exc) throws IOExce
@Override @Override
public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException { public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException {
Files.delete(dir); if (!this.from.equals(dir)) Files.delete(dir);
return FileVisitResult.CONTINUE; return FileVisitResult.CONTINUE;
} }
} }