Changeset 4976e523


Ignore:
Timestamp:
Apr 20, 2013 6:53:01 PM (8 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
0c22af9
Parents:
88afb23
Message:

Pluck of 40d650b134e48bdb0bb636227381c22217365c47

  • WorkingDir?: Correctly strip DOS line endings while migrating,

to fix eepsite location on 0.9.5 Windows installs (ticket #919)

applied changes from cc74155815c98674b74cd7d9abb59704005d6b85

through 40d650b134e48bdb0bb636227381c22217365c47

File:
1 edited

Legend:

Unmodified
Added
Removed
  • router/java/src/net/i2p/router/startup/WorkingDir.java

    r88afb23 r4976e523  
    295295            boolean isDaemon = DAEMON_USER.equals(System.getProperty("user.name"));
    296296            while ((s = DataHelper.readLine(in)) != null) {
     297                // readLine() doesn't strip \r
     298                if (s.endsWith("\r"))
     299                    s = s.substring(0, s.length() - 1);
    297300                if (s.endsWith("=\"eepsite/jetty.xml\"")) {
    298301                    s = s.replace("=\"eepsite/jetty.xml\"", "=\"" + todir.getAbsolutePath() +
     
    334337            String s = null;
    335338            while ((s = DataHelper.readLine(in)) != null) {
     339                // readLine() doesn't strip \r
     340                if (s.endsWith("\r"))
     341                    s = s.substring(0, s.length() - 1);
    336342                if (s.indexOf(oldString) >= 0) {
    337343                    s = s.replace(oldString, newString);
Note: See TracChangeset for help on using the changeset viewer.