From: Jan Doskočil Date: Fri, 21 Feb 2025 15:18:39 +0000 (+0100) Subject: scripts: avoid name collisions in update_ngtcp2.sh X-Git-Tag: v3.5.0~149 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f7923bb2fed2a3ba82f9fed53820eddeb9ad5ca3;p=thirdparty%2Fknot-dns.git scripts: avoid name collisions in update_ngtcp2.sh --- diff --git a/scripts/update_ngtcp2.sh b/scripts/update_ngtcp2.sh index ee2324cd80..3217a9fc93 100755 --- a/scripts/update_ngtcp2.sh +++ b/scripts/update_ngtcp2.sh @@ -37,7 +37,7 @@ done <"${clonedir}/deleted" # update changed files find . -type f | while IFS=$'\n' read -r line; do base="$(basename "$line")" - match="$(grep -m1 "$base" "${clonedir}/changed" || true)" + match="$(grep -Em1 '(^|/)'"$base"'$' "${clonedir}/changed" || true)" if [ -n "$match" ]; then cp "$match" "$line" fi