I2P_Developers/i2p.firefox
3
0
Fork 1
Code Issues 14 Pull Requests Packages Projects Releases Wiki Activity

selectHome and selectProgramFile need to be the same

Browse Source
This commit is contained in:
idk
2022-09-13 12:50:11 -04:00
parent 068a8ef1a6
commit e94d008335
1 changed files with 6 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
java/net/i2p/router/CopyConfigDir.java
View File

@@ -132,17 +132,9 @@ public class CopyConfigDir {
throw new RuntimeException("I2P_CONFIG is not a directory: " + path); throw new RuntimeException("I2P_CONFIG is not a directory: " + path);
} }
} }
if (osName() == "windows") {
File i2p = appImageHome(); File i2p = appImageHome();
logger.info("Checking for signs of life in I2P directory: " + i2p); logger.info("Checking for signs of life in I2P directory: " + i2p);
return i2p; return i2p;
} else {
File i2p = appImageHome();
File programs = new File(i2p, ".i2p");
logger.info("Linux portable jpackage wrapper starting up, using: " +
programs + " as base config");
return programs.getAbsoluteFile();
}
} }
protected static File selectProgramFile() { protected static File selectProgramFile() {
@@ -156,19 +148,9 @@ public class CopyConfigDir {
throw new RuntimeException("I2P is not a directory: " + path); throw new RuntimeException("I2P is not a directory: " + path);
} }
} }
if (osName() == "windows") { File i2p = appImageHome();
File jrehome = new File(System.getProperty("java.home")); logger.info("Checking for signs of life in I2P directory: " + i2p);
File programs = jrehome.getParentFile(); return i2p;
logger.info("Windows portable jpackage wrapper found, using: " +
programs + " as working config");
return programs.getAbsoluteFile();
} else {
File jrehome = new File(System.getProperty("java.home"));
File programs = new File(jrehome.getParentFile().getParentFile(), "i2p");
logger.info("Linux portable jpackage wrapper found, using: " + programs +
" as working config");
return programs.getAbsoluteFile();
}
} }
/** /**