rife2/bld-detekt
rife2/bld-detekt
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Removed paths quoting

Browse source
This commit is contained in:
Erik C. Thauvin 2025-03-24 16:12:15 -07:00
parent 3e350e617a
commit 5a2824507f
Signed by: erik
GPG key ID: 776702A6A2DA330E
1 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/main/java/rife/bld/extension/DetektOperation.java
View file

@ -522,7 +522,7 @@ public class DetektOperation extends AbstractProcessOperation<DetektOperation> {
if (project_ != null) { if (project_ != null) {
args.add(javaTool()); args.add(javaTool());
args.add("-cp"); args.add("-cp");
args.add('"' + getDetektJarList(project_.libBldDirectory()) + '"'); args.add(getDetektJarList(project_.libBldDirectory()));
args.add("io.gitlab.arturbosch.detekt.cli.Main"); args.add("io.gitlab.arturbosch.detekt.cli.Main");
// all-rules // all-rules
@ -538,13 +538,13 @@ public class DetektOperation extends AbstractProcessOperation<DetektOperation> {
// base-path // base-path
if (isNotBlank(basePath_)) { if (isNotBlank(basePath_)) {
args.add("--base-path"); args.add("--base-path");
args.add('"' + cleanPath(basePath_) + '"'); args.add(cleanPath(basePath_));
} }
// baseline // baseline
if (isNotBlank(baseline_)) { if (isNotBlank(baseline_)) {
args.add("--baseline"); args.add("--baseline");
args.add('"' + cleanPath(baseline_) + '"'); args.add(cleanPath(baseline_));
} }
// build-upon-default-config // build-upon-default-config
@ -555,20 +555,19 @@ public class DetektOperation extends AbstractProcessOperation<DetektOperation> {
// classpath // classpath
if (!classpath_.isEmpty()) { if (!classpath_.isEmpty()) {
args.add("--classpath"); args.add("--classpath");
args.add('"' + String.join(':' + File.pathSeparator, classpath_.stream().map(this::cleanPath).toList()) args.add(String.join(File.pathSeparator, classpath_.stream().map(this::cleanPath).toList()));
+ '"');
} }
// config // config
if (!config_.isEmpty()) { if (!config_.isEmpty()) {
args.add("-config"); args.add("-config");
args.add('"' + String.join(";", config_.stream().map(this::cleanPath).toList()) + '"'); args.add(String.join(";", config_.stream().map(this::cleanPath).toList()));
} }
// config-resource // config-resource
if (isNotBlank(configResource_)) { if (isNotBlank(configResource_)) {
args.add("--config-resource"); args.add("--config-resource");
args.add('"' + cleanPath(configResource_) + '"'); args.add(cleanPath(configResource_));
} }
// create-baseline // create-baseline
@ -589,7 +588,7 @@ public class DetektOperation extends AbstractProcessOperation<DetektOperation> {
// excludes // excludes
if (!excludes_.isEmpty()) { if (!excludes_.isEmpty()) {
args.add("--excludes"); args.add("--excludes");
args.add('"' + String.join(",", excludes_.stream().map(this::cleanPath).toList()) + '"'); args.add(String.join(",", excludes_.stream().map(this::cleanPath).toList()));
} }
// generate-config // generate-config
@ -600,19 +599,19 @@ public class DetektOperation extends AbstractProcessOperation<DetektOperation> {
// includes // includes
if (!includes_.isEmpty()) { if (!includes_.isEmpty()) {
args.add("--includes"); args.add("--includes");
args.add('"' + String.join(",", includes_.stream().map(this::cleanPath).toList()) + '"'); args.add(String.join(",", includes_.stream().map(this::cleanPath).toList()));
} }
// input // input
if (!input_.isEmpty()) { if (!input_.isEmpty()) {
args.add("--input"); args.add("--input");
args.add('"' + String.join(",", input_.stream().map(this::cleanPath).toList()) + '"'); args.add(String.join(",", input_.stream().map(this::cleanPath).toList()));
} }
// jdk-home // jdk-home
if (isNotBlank(jdkHome_)) { if (isNotBlank(jdkHome_)) {
args.add("--jdk-home"); args.add("--jdk-home");
args.add('"' + cleanPath(jdkHome_) + '"'); args.add(cleanPath(jdkHome_));
} }
// jvm-target // jvm-target
@ -641,14 +640,14 @@ public class DetektOperation extends AbstractProcessOperation<DetektOperation> {
// plugins // plugins
if (!plugins_.isEmpty()) { if (!plugins_.isEmpty()) {
args.add("--plugins"); args.add("--plugins");
args.add('"' + String.join(",", plugins_.stream().map(this::cleanPath).toList()) + '"'); args.add(String.join(",", plugins_.stream().map(this::cleanPath).toList()));
} }
// report // report
if (!report_.isEmpty()) { if (!report_.isEmpty()) {
report_.forEach(it -> { report_.forEach(it -> {
args.add("--report"); args.add("--report");
args.add(it.id().name().toLowerCase() + ":\"" + cleanPath(it.path()) + '"'); args.add(it.id().name().toLowerCase() + ":" + cleanPath(it.path()));
}); });
} }