root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Rework OptionHandler '-cp' argument support 

Change OptionHandler to support '-cp' instead of '--cp'. This update
to the original fix (045088e8b) renders `help` output correctly and
should prevent potential issues if a `-p` command is added in the future.

Fixes gh-178
This commit is contained in:
Phillip Webb 2014-01-02 11:42:59 -08:00
parent 3a82eac2e6
commit 0f9c705980
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
spring-boot-cli/src/main/java/org/springframework/boot/cli/command/OptionHandler.java
View File

@ -84,6 +84,12 @@ public class OptionHandler {
}
public final void run(String... args) throws Exception {
String[] argsToUse = args.clone();
for (int i = 0; i < argsToUse.length; i++) {
if ("-cp".equals(argsToUse[i])) {
argsToUse[i] = "--cp";
}
}
OptionSet options = getParser().parse(args);
run(options);
}
@ -106,7 +112,7 @@ public class OptionHandler {
catch (IOException ex) {
return "Help not available";
}
this.help = out.toString();
this.help = out.toString().replace(" --cp ", " -cp ");
}
return this.help;
}
@ -169,6 +175,7 @@ public class OptionHandler {
this.options.add((option.length() == 1 ? "-" : "--") + option);
}
if (this.options.contains("--cp")) {
this.options.remove("--cp");
this.options.add("-cp");
}
this.description = descriptor.description();