From 111c848e2d90d962a7f48d7b4121304247829473 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Wed, 05 Sep 2007 06:40:30 +0000
Subject: [PATCH] The following changes are targetted to fix a certain number of issues related to the setup command line:
---
opends/src/quicksetup/org/opends/quicksetup/CurrentInstallStatus.java | 36 +++++++++++++++++++++++++++---------
1 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/CurrentInstallStatus.java b/opends/src/quicksetup/org/opends/quicksetup/CurrentInstallStatus.java
index d806213..65bfcc9 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/CurrentInstallStatus.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/CurrentInstallStatus.java
@@ -95,21 +95,39 @@
isInstalled = msgs.size() > 0;
if (canOverwriteCurrentInstall)
{
- installationMsg =
- INFO_INSTALLSTATUS_CANOVERWRITECURRENTINSTALL_MSG.get();
+ installationMsg = !Utils.isCli()?
+ INFO_INSTALLSTATUS_CANOVERWRITECURRENTINSTALL_MSG.get() :
+ INFO_INSTALLSTATUS_CANOVERWRITECURRENTINSTALL_MSG_CLI.get();
}
else if (isInstalled)
{
MessageBuilder buf = new MessageBuilder();
- buf.append("<ul>");
- for (Message msg : msgs)
+ if (Utils.isCli())
{
- buf.append("\n<li>");
- buf.append(msg);
- buf.append("</li>");
+ buf = new MessageBuilder();
+ for (Message msg : msgs)
+ {
+ buf.append(Constants.LINE_SEPARATOR);
+ buf.append("- "+msg);
+ }
+ String cmd = Utils.isWindows() ?
+ Installation.WINDOWS_SETUP_FILE_NAME :
+ Installation.UNIX_SETUP_FILE_NAME;
+ installationMsg =
+ INFO_INSTALLSTATUS_INSTALLED_CLI.get(cmd, buf.toString());
}
- buf.append("</ul>");
- installationMsg = INFO_INSTALLSTATUS_INSTALLED.get( buf.toString() );
+ else
+ {
+ buf.append("<ul>");
+ for (Message msg : msgs)
+ {
+ buf.append("\n<li>");
+ buf.append(msg);
+ buf.append("</li>");
+ }
+ buf.append("</ul>");
+ installationMsg = INFO_INSTALLSTATUS_INSTALLED.get( buf.toString() );
+ }
}
}
if (!isInstalled)
--
Gitblit v1.10.0