Merge "Add ui messages about updating or installing each plugin using pgm init"
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitPlugins.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitPlugins.java
index e5642f3..c9b2b92 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitPlugins.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitPlugins.java
@@ -132,9 +132,8 @@
if (upgrade) {
final String installedPluginVersion = getVersion(p);
- if (!ui.yesno(upgrade,
- "version %s is already installed, overwrite it",
- installedPluginVersion)) {
+ if (!ui.yesno(upgrade, "%s %s is already installed, overwrite it",
+ plugin.name, installedPluginVersion)) {
Files.deleteIfExists(tmpPlugin);
continue;
}
@@ -147,6 +146,12 @@
}
try {
Files.move(tmpPlugin, p);
+ if (upgrade) {
+ // or update that is not an upgrade
+ ui.message("Updated %s to %s\n", plugin.name, plugin.version);
+ } else {
+ ui.message("Installed %s %s\n", plugin.name, plugin.version);
+ }
} catch (IOException e) {
throw new IOException("Failed to install plugin " + pluginName
+ ": " + tmpPlugin.toAbsolutePath() + " -> "