Skip to content

Correctly escape newlines in tr invocations #48

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
chrisnovakovic merged 1 commit into from
Nov 22, 2024
Merged

Correctly escape newlines in tr invocations #48

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
4 changes: 2 additions & 2 deletions build_defs/java.build_defs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ def java_library(name:str, srcs:list=None, src_dir:str=None, resources:list=[],

srcflag = '`find $SRCS_JAVAC -name "*.java"`' if src_dir else '$SRCS_JAVAC'
javac_flags = " ".join(javac_flags)
javac_cmd = f'mkdir -p _tmp/META-INF && "$TOOLS_JAVAC" {javac_flags} -classpath .:`{find} | tr \\\\\\\\n :` -d _tmp {srcflag}'
javac_cmd = f'''mkdir -p _tmp/META-INF && "$TOOLS_JAVAC" {javac_flags} -classpath .:`{find} | tr '\\n' :` -d _tmp {srcflag}'''


cmd = ' && '.join([
Expand Down Expand Up @@ -224,7 +224,7 @@ def java_runtime_image(name:str, out:str=None, modules:list, launcher_module:str
if (launcher_module and not launcher_class) or (launcher_class and not launcher_module):
fail("launcher_module and launcher_class must be defined together - they cannot be defined individually.")
out = out or name
depflags = r'`find "$TMP_DIR" -name "*.jar" | tr \\\\n :`'
depflags = r'''`find "$TMP_DIR" -name "*.jar" | tr '\n' :`'''
modules = ','.join(modules)
default_jlink_args = [
f"--module-path {depflags}:{home}/jmods",
Expand Down
Loading