mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

jvergara
29.56.2007 995ce7432b5d2d94c668cca3b6621e948a487332
Fix for issue 1854.

Update the usage to use 'c' as a short option for 'cli' instead of 'i'.

Update the code to accept the short argument for cli.
4 files modified
10 ■■■■■ changed files
opends/src/quicksetup/org/opends/quicksetup/Launcher.java 2 ●●● patch | view | raw | blame | history
opends/src/quicksetup/org/opends/quicksetup/installer/InstallLauncher.java 5 ●●●●● patch | view | raw | blame | history
opends/src/quicksetup/org/opends/quicksetup/uninstaller/UninstallCliHelper.java 1 ●●●● patch | view | raw | blame | history
opends/src/quicksetup/org/opends/quicksetup/uninstaller/UninstallLauncher.java 2 ●●● patch | view | raw | blame | history
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;
      }
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]);
        }
      }
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");
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",