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

WorkingDir: Fix detection of migrated directory

Browse Source
This commit is contained in:
zzz
2012-02-10 21:54:43 +00:00
parent 4cea4514a0
commit 29c85254e7
3 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
history.txt
View File

@@ -1,3 +1,9 @@
2012-02-10 zzz
* WorkingDir: Fix detection of migrated directory
2012-02-09 zzz
* i2psnark: Escape semicolons
2012-02-04 zzz 2012-02-04 zzz
* Deprecate util classes used only by installer * Deprecate util classes used only by installer
* ProfileOrganizer: Add profileOrganizer.sameCountryBonus config * ProfileOrganizer: Add profileOrganizer.sameCountryBonus config

2
router/java/src/net/i2p/router/RouterVersion.java
View File

@@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */ /** deprecated */
public final static String ID = "Monotone"; public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION; public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 11; public final static long BUILD = 12;
/** for example "-test" */ /** for example "-test" */
public final static String EXTRA = ""; public final static String EXTRA = "";

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

@@ -184,21 +184,24 @@ public class WorkingDir {
/** /**
* Tests if <code>dir</code> has been set up as a I2P working directory.<br/> * Tests if <code>dir</code> has been set up as a I2P working directory.<br/>
* Returns <code>false</code> if a directory is empty, or contains nothing besides * Returns <code>false</code> if a directory is empty, or contains nothing that
* subdirectories named <code>plugins</code> and/or <code>logs</code>.<br/> * is usually migrated from the base install.
* Returns <code>true</code> if the directory contains something not named
* <code>plugins</code> or <code>logs</code>.</br>
* This allows to pre-install plugins before the first router start. * This allows to pre-install plugins before the first router start.
* @return true if already set up
*/ */
private static boolean isSetup(File dir) { private static boolean isSetup(File dir) {
if (dir.isDirectory()) { if (dir.isDirectory()) {
String[] files = dir.list(); String[] files = dir.list();
if (files == null) if (files == null)
return false; return false;
for (String file: files) String migrated[] = MIGRATE_BASE.split(",");
if (!"plugins".equals(file) && !"logs".equals(file)) for (String file: files) {
for (int i = 0; i < migrated.length; i++) {
if (file.equals(migrated[i]))
return true; return true;
} }
}
}
return false; return false;
} }