From 995ce7432b5d2d94c668cca3b6621e948a487332 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Fri, 29 Jun 2007 13:56:43 +0000
Subject: [PATCH] Fix for issue 1854.
---
opends/src/quicksetup/org/opends/quicksetup/Launcher.java | 2 +-
opends/src/quicksetup/org/opends/quicksetup/installer/InstallLauncher.java | 5 +++--
opends/src/quicksetup/org/opends/quicksetup/uninstaller/UninstallCliHelper.java | 1 +
opends/src/quicksetup/org/opends/quicksetup/uninstaller/UninstallLauncher.java | 2 +-
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/Launcher.java b/opends/src/quicksetup/org/opends/quicksetup/Launcher.java
index 55ca1fd..e472b62 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/Launcher.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/Launcher.java
@@ -115,7 +115,7 @@
protected boolean isCli() {
boolean isCli = false;
for (String arg : args) {
- if (arg.equalsIgnoreCase("--cli")) {
+ if (arg.equalsIgnoreCase("--cli") || arg.equalsIgnoreCase("-c")) {
isCli = true;
break;
}
diff --git a/opends/src/quicksetup/org/opends/quicksetup/installer/InstallLauncher.java b/opends/src/quicksetup/org/opends/quicksetup/installer/InstallLauncher.java
index c4eb6af..d57f52a 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/installer/InstallLauncher.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/installer/InstallLauncher.java
@@ -178,7 +178,7 @@
try
{
- cliMode = new BooleanArgument("cli", null, OPTION_LONG_CLI,
+ cliMode = new BooleanArgument("cli", 'c', OPTION_LONG_CLI,
MSGID_INSTALLDS_DESCRIPTION_CLI);
argParser.addArgument(cliMode);
@@ -302,7 +302,8 @@
ArrayList<String> newArgList = new ArrayList<String>();
if (args != null) {
for (int i = 0; i < args.length; i++) {
- if (!args[i].equalsIgnoreCase("--cli")) {
+ if (!args[i].equalsIgnoreCase("--cli") &&
+ !args[i].equalsIgnoreCase("-c")) {
newArgList.add(args[i]);
}
}
diff --git a/opends/src/quicksetup/org/opends/quicksetup/uninstaller/UninstallCliHelper.java b/opends/src/quicksetup/org/opends/quicksetup/uninstaller/UninstallCliHelper.java
index 341ee00..6f12ebe 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/uninstaller/UninstallCliHelper.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/uninstaller/UninstallCliHelper.java
@@ -78,6 +78,7 @@
*/
Set<String> validArgs = new HashSet<String>();
validArgs.add("--cli");
+ validArgs.add("-c");
validArgs.add("-H");
validArgs.add("--help");
validArgs.add("--silentUninstall");
diff --git a/opends/src/quicksetup/org/opends/quicksetup/uninstaller/UninstallLauncher.java b/opends/src/quicksetup/org/opends/quicksetup/uninstaller/UninstallLauncher.java
index afe965e..5e0f4d3 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/uninstaller/UninstallLauncher.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/uninstaller/UninstallLauncher.java
@@ -142,7 +142,7 @@
System.setProperty(ServerConstants.PROPERTY_SCRIPT_NAME, scriptName);
try
{
- cli = new BooleanArgument("cli", 'i', "cli",
+ cli = new BooleanArgument("cli", 'c', "cli",
MSGID_UNINSTALLDS_DESCRIPTION_CLI);
argParser.addArgument(cli);
silent = new BooleanArgument("silent", 's', "silent",
--
Gitblit v1.10.0