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

message tweaks if no wrapperr

Browse Source
This commit is contained in:
zzz
2009-05-21 13:12:47 +00:00
parent 4426cc359c
commit d927f8bcb0
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/routerconsole/java/src/net/i2p/router/web/UpdateHandler.java
View File

@ -179,7 +179,11 @@ public class UpdateHandler {
restart(); restart();
} else { } else {
_log.log(Log.CRIT, "Update was VERIFIED, will be installed at next restart"); _log.log(Log.CRIT, "Update was VERIFIED, will be installed at next restart");
_status = "<b>Update downloaded</b><br />Click Restart to Install"; _status = "<b>Update downloaded</b><br />";
if (System.getProperty("wrapper.version") != null)
_status += "Click Restart to install";
else
_status += "Click Shutdown and restart to install";
if (up.newVersion() != null) if (up.newVersion() != null)
_status += " Version " + up.newVersion(); _status += " Version " + up.newVersion();
} }

5
router/java/src/net/i2p/router/Router.java
View File

@ -1029,7 +1029,10 @@ public class Router {
System.out.println("ERROR: Unable to delete the update file!"); System.out.println("ERROR: Unable to delete the update file!");
updateFile.deleteOnExit(); updateFile.deleteOnExit();
} }
System.out.println("INFO: Restarting after update"); if (System.getProperty("wrapper.version") != null)
System.out.println("INFO: Restarting after update");
else
System.out.println("WARNING: Exiting after update, restart I2P");
System.exit(EXIT_HARD_RESTART); System.exit(EXIT_HARD_RESTART);
} }
} }