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.
| | |
| | | protected boolean isCli() { |
| | | boolean isCli = false; |
| | | for (String arg : args) { |
| | | if (arg.equalsIgnoreCase("--cli")) { |
| | | if (arg.equalsIgnoreCase("--cli") || arg.equalsIgnoreCase("-c")) { |
| | | isCli = true; |
| | | break; |
| | | } |
| | |
| | | |
| | | try |
| | | { |
| | | cliMode = new BooleanArgument("cli", null, OPTION_LONG_CLI, |
| | | cliMode = new BooleanArgument("cli", 'c', OPTION_LONG_CLI, |
| | | MSGID_INSTALLDS_DESCRIPTION_CLI); |
| | | argParser.addArgument(cliMode); |
| | | |
| | |
| | | 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]); |
| | | } |
| | | } |
| | |
| | | */ |
| | | Set<String> validArgs = new HashSet<String>(); |
| | | validArgs.add("--cli"); |
| | | validArgs.add("-c"); |
| | | validArgs.add("-H"); |
| | | validArgs.add("--help"); |
| | | validArgs.add("--silentUninstall"); |
| | |
| | | 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", |