Skip to content

(via ryandens): Fix Windows batch script: use separate quoted tokens for multiple javaag #374

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ryandens merged 1 commit into from
Jul 6, 2026
Merged

(via ryandens): Fix Windows batch script: use separate quoted tokens for multiple javaag #374

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions plugin/src/main/kotlin/com/ryandens/javaagent/JavaagentAwareStartScriptGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class JavaagentAwareStartScriptGenerator(
details: JavaAppStartScriptGenerationDetails,
destination: Writer,
) {
inner.generateScript(details, Fake(destination, javaagentConfiguration, platform.pathSeparator, platform.appHomeVar))
inner.generateScript(details, Fake(destination, javaagentConfiguration, platform.pathSeparator, platform.appHomeVar, platform))
}

private class FakeTransformer(
Expand All @@ -48,6 +48,7 @@ class JavaagentAwareStartScriptGenerator(
private val javaagentFiles: Provider<Set<File>>,
private val pathSeparator: String,
private val appHomeVar: String,
private val platform: Platform,
) : Writer() {
override fun close() {
inner.close()
Expand Down Expand Up @@ -76,10 +77,14 @@ class JavaagentAwareStartScriptGenerator(
"",
).replace("-javaagent:COM_RYANDENS_JAVAAGENTS_PLACEHOLDER.jar", "")
} else {
// On Windows, each -javaagent option must be a separately quoted token,
// so we use `" "` (close quote, space, open quote) as separator.
// On Unix, all options can be space-separated within a single quoted string.
val separator = if (platform == Platform.WINDOWS) "\" \"" else " "
str.replace(
"-javaagent:COM_RYANDENS_JAVAAGENTS_PLACEHOLDER.jar",
javaagentFiles.get().joinToString(
" ",
separator,
) { jar -> "-javaagent:${appHomeVar}${pathSeparator}agent-libs${pathSeparator}${jar.name}" },
)
}
Expand Down
Loading