Changeset a474bd4 for router


Ignore:
Timestamp:
Apr 10, 2018 3:23:41 PM (2 years ago)
Author:
meeh <meeh@…>
Branches:
master
Children:
57e21e90
Parents:
f00ac6a (diff), 7ae8381 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

merge of '3acb036bb44bfe12916742877b1b2298ef6a156a'

and '674ef573b3a8e4620f0e06397e062d86fc87a5a9'

Location:
router/java/src/net/i2p/router
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • router/java/src/net/i2p/router/Router.java

    rf00ac6a ra474bd4  
    276276        String isPortableStr = System.getProperty("i2p.dir.portableMode");
    277277        boolean isPortable = Boolean.parseBoolean(isPortableStr);
    278         String userDir = (!isPortable) ? WorkingDir.getWorkingDir(envProps, migrateFiles) : PortableWorkingDir.getWorkingDir(envProps, migrateFiles);
     278        String userDir = (!isPortable) ? WorkingDir.getWorkingDir(envProps, migrateFiles) : PortableWorkingDir.getWorkingDir(envProps);
    279279
    280280        // Use the router.config file specified in the router.configLocation property
  • router/java/src/net/i2p/router/startup/PortableWorkingDir.java

    rf00ac6a ra474bd4  
    2424 * Just FYI:
    2525 * In the context of a BB:
    26  * 
     26 *
    2727 * On OSX it has to look 3 paths up, but for the other two, only one.
    2828 *
     
    4747 * @author (who to blame) Meeh
    4848 * @version 0.2
     49 * @since 0.9.35
    4950 */
    5051public class PortableWorkingDir {
Note: See TracChangeset for help on using the changeset viewer.