From 20657e8bb5e6e91f640e98b13404cc61a22e84e4 Mon Sep 17 00:00:00 2001 From: Skylot Date: Mon, 6 Jun 2022 19:55:58 +0100 Subject: [PATCH] doc(cli): improve plugins section formatting --- README.md | 10 +++++----- jadx-cli/src/main/java/jadx/cli/JCommanderWrapper.java | 6 +++--- .../java/jadx/plugins/input/dex/DexInputOptions.java | 2 +- .../plugins/input/javaconvert/JavaConvertOptions.java | 4 ++-- .../plugins/input/javaconvert/JavaConvertPlugin.java | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index d4fd1e9968a..2a9287cfe1a 100644 --- a/README.md +++ b/README.md @@ -136,11 +136,11 @@ options: -h, --help - print this help Plugin options (-P=): - 1) dex-input (Load .dex and .apk files) - -Pdex-input.verify-checksum - Verify dex file checksum before load, values: [yes, no], default: yes - 2) java-convert (Convert .jar and .class files to dex) - -Pjava-convert.mode - Convert mode, values: [dx, d8, both], default: both - -Pjava-convert.d8-desugar - Use desugar in d8, values: [yes, no], default: no + 1) dex-input: Load .dex and .apk files + - dex-input.verify-checksum - verify dex file checksum before load, values: [yes, no], default: yes + 2) java-convert: Convert .class, .jar and .aar files to dex + - java-convert.mode - convert mode, values: [dx, d8, both], default: both + - java-convert.d8-desugar - use desugar in d8, values: [yes, no], default: no Examples: jadx -d out classes.dex diff --git a/jadx-cli/src/main/java/jadx/cli/JCommanderWrapper.java b/jadx-cli/src/main/java/jadx/cli/JCommanderWrapper.java index 2929d32842c..d582b31797a 100644 --- a/jadx-cli/src/main/java/jadx/cli/JCommanderWrapper.java +++ b/jadx-cli/src/main/java/jadx/cli/JCommanderWrapper.java @@ -193,11 +193,11 @@ private boolean appendPlugin(JadxPluginOptions plugin, StringBuilder out, int ma return false; } JadxPluginInfo pluginInfo = plugin.getPluginInfo(); - out.append("\n ").append(k).append(") "); - out.append(pluginInfo.getPluginId()).append(" (").append(pluginInfo.getDescription()).append(") "); + out.append("\n ").append(k).append(") "); + out.append(pluginInfo.getPluginId()).append(": ").append(pluginInfo.getDescription()); for (OptionDescription desc : descs) { StringBuilder opt = new StringBuilder(); - opt.append(" -P").append(desc.name()); + opt.append(" - ").append(desc.name()); addSpaces(opt, maxNamesLen - opt.length()); opt.append("- ").append(desc.description()); if (!desc.values().isEmpty()) { diff --git a/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/DexInputOptions.java b/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/DexInputOptions.java index cc34c79e06a..5672f30fa46 100644 --- a/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/DexInputOptions.java +++ b/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/DexInputOptions.java @@ -23,7 +23,7 @@ public List buildOptionsDescriptions() { return Collections.singletonList( new JadxOptionDescription( VERIFY_CHECKSUM_OPT, - "Verify dex file checksum before load", + "verify dex file checksum before load", "yes", Arrays.asList("yes", "no"))); } diff --git a/jadx-plugins/jadx-java-convert/src/main/java/jadx/plugins/input/javaconvert/JavaConvertOptions.java b/jadx-plugins/jadx-java-convert/src/main/java/jadx/plugins/input/javaconvert/JavaConvertOptions.java index 044c082811f..85391e61c3b 100644 --- a/jadx-plugins/jadx-java-convert/src/main/java/jadx/plugins/input/javaconvert/JavaConvertOptions.java +++ b/jadx-plugins/jadx-java-convert/src/main/java/jadx/plugins/input/javaconvert/JavaConvertOptions.java @@ -30,12 +30,12 @@ public List buildOptionsDescriptions() { return Arrays.asList( new JadxOptionDescription( MODE_OPT, - "Convert mode", + "convert mode", "both", Arrays.asList("dx", "d8", "both")), new JadxOptionDescription( D8_DESUGAR_OPT, - "Use desugar in d8", + "use desugar in d8", "no", Arrays.asList("yes", "no"))); } diff --git a/jadx-plugins/jadx-java-convert/src/main/java/jadx/plugins/input/javaconvert/JavaConvertPlugin.java b/jadx-plugins/jadx-java-convert/src/main/java/jadx/plugins/input/javaconvert/JavaConvertPlugin.java index 072e92afd44..34d0ba95699 100644 --- a/jadx-plugins/jadx-java-convert/src/main/java/jadx/plugins/input/javaconvert/JavaConvertPlugin.java +++ b/jadx-plugins/jadx-java-convert/src/main/java/jadx/plugins/input/javaconvert/JavaConvertPlugin.java @@ -25,7 +25,7 @@ public JadxPluginInfo getPluginInfo() { return new JadxPluginInfo( PLUGIN_ID, "JavaConvert", - "Convert .jar and .class files to dex", + "Convert .class, .jar and .aar files to dex", "java-input"); }