From d927f8bcb0c0d7c70fb616955c12ed2de75d4322 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Thu, 21 May 2009 13:12:47 +0000
Subject: [PATCH] message tweaks if no wrapperr
---
.../java/src/net/i2p/router/web/UpdateHandler.java | 6 +++++-
router/java/src/net/i2p/router/Router.java | 5 ++++-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/UpdateHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/UpdateHandler.java
index 2a0e077c06..35edadfb6b 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/UpdateHandler.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/UpdateHandler.java
@@ -179,7 +179,11 @@ public class UpdateHandler {
restart();
} else {
_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)
_status += " Version " + up.newVersion();
}
diff --git a/router/java/src/net/i2p/router/Router.java b/router/java/src/net/i2p/router/Router.java
index a849e385ca..d2fb6f19d9 100644
--- a/router/java/src/net/i2p/router/Router.java
+++ b/router/java/src/net/i2p/router/Router.java
@@ -1029,7 +1029,10 @@ public class Router {
System.out.println("ERROR: Unable to delete the update file!");
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);
}
}
--
GitLab