zzz/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

If the working directory contains only a plugins/ subdir, initialize it like it is empty

Browse Source
This commit is contained in:
HungryHobo
2010-11-04 06:49:12 +00:00
parent 77e0cb94d3
commit 8593931171
1 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
router/java/src/net/i2p/router/startup/WorkingDir.java
View File

@@ -112,10 +112,14 @@ public class WorkingDir {
// where we want to go
String rv = dirf.getAbsolutePath();
if (dirf.exists()) {
if (dirf.isDirectory())
return rv; // all is good, we found the user directory
System.err.println("Wanted to use " + rv + " for a working directory but it is not a directory");
return cwd;
if (dirf.isDirectory()) {
if (isSetup(dirf))
return rv; // all is good, we found the user directory
}
else {
System.err.println("Wanted to use " + rv + " for a working directory but it is not a directory");
return cwd;
}
}
// Check for a router.keys file or logs dir, if either exists it's an old install,
// and only migrate the data files if told to do so
@@ -131,7 +135,7 @@ public class WorkingDir {
return cwd;
boolean migrateOldData = false; // this is a terrible idea
if (!dirf.mkdir()) {
if (!dirf.exists() && !dirf.mkdir()) {
System.err.println("Wanted to use " + rv + " for a working directory but could not create it");
return cwd;
}
@@ -159,6 +163,18 @@ public class WorkingDir {
}
}
/** Returns <code>false</code> if a directory is empty, or contains nothing besides a subdirectory named plugins */
private static boolean isSetup(File dir) {
if (dir.isDirectory()) {
String[] files = dir.list();
if (files.length == 0)
return false;
if (files.length>1 || !"plugins".equals(files[0]))
return true;
}
return false;
}
/**
* files and directories from the base install to copy over
* None of these should be included in i2pupdate.zip