Skip to content

Commit 8e5d4b1

Browse files
committed
Pass classes as separate arguments to template_default
To work around problem with passing newlines in variable with awk on darwin. This fixes #437.
1 parent d74a41b commit 8e5d4b1

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

yadm

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -369,6 +369,10 @@ function template_default() {
369369
# all versions of awk seem to support the POSIX character classes [[:blank:]]
370370
read -r -d '' awk_pgm << "EOF"
371371
BEGIN {
372+
classes = ARGV[2]
373+
for (i = 3; i < ARGC; ++i) {
374+
classes = classes "\n" ARGV[i]
375+
}
372376
yadm["class"] = class
373377
yadm["classes"] = classes
374378
yadm["arch"] = arch
@@ -485,9 +489,8 @@ EOF
485489
-v distro_family="$local_distro_family" \
486490
-v source="$input" \
487491
-v source_dir="$(dirname "$input")" \
488-
-v classes="$(join_string $'\n' "${local_classes[@]}")" \
489492
"$awk_pgm" \
490-
"$input" > "$temp_file" || rm -f "$temp_file"
493+
"$input" "${local_classes[@]}" > "$temp_file" || rm -f "$temp_file"
491494

492495
move_file "$input" "$output" "$temp_file"
493496
}

0 commit comments

Comments
 (0)