Merge pull request #99019 from BenTheElder/unit-test-cluster-macos

portably configure tempdir in configure-helper.sh
This commit is contained in:
Kubernetes Prow Robot
2021-02-12 02:06:47 -08:00
committed by GitHub

View File

@@ -608,7 +608,7 @@ function append_or_replace_prefixed_line {
local -r prefix="${2:-}" local -r prefix="${2:-}"
local -r suffix="${3:-}" local -r suffix="${3:-}"
local -r dirname=$(dirname "${file}") local -r dirname=$(dirname "${file}")
local -r tmpfile=$(mktemp -t filtered.XXXX --tmpdir="${dirname}") local -r tmpfile=$(mktemp "${dirname}/filtered.XXXX")
touch "${file}" touch "${file}"
awk -v pfx="${prefix}" 'substr($0,1,length(pfx)) != pfx { print }' "${file}" > "${tmpfile}" awk -v pfx="${prefix}" 'substr($0,1,length(pfx)) != pfx { print }' "${file}" > "${tmpfile}"