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

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

View file

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

View file

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