Skip to content

Commit 04d9392

Browse files
CopilotXmader
andauthored
Handle unmatched Homebrew bottle paths
Co-authored-by: Xmader <16057139+Xmader@users.noreply.github.com>
1 parent aa6ff0b commit 04d9392

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

‎cmake/macos-brew-deps.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ relocate_bottle() {
3636
find "$dir" -type f ! -type l | while IFS= read -r f; do
3737
file "$f" | grep -q 'Mach-O' || continue
3838
chmod u+w "$f"
39-
otool -L "$f" | awk 'NR>1{print $1}' | grep '@@HOMEBREW_' | while IFS= read -r old; do
39+
otool -L "$f" | awk 'NR>1 && /@@HOMEBREW_/{print $1}' | while IFS= read -r old; do
4040
install_name_tool -change "$old" "$(_reloc "$old")" "$f"
4141
done
42-
old="$(otool -D "$f" | sed -n '2p')"
42+
old="$(otool -D "$f" 2>/dev/null | sed -n '2p' || true)"
4343
if [[ "$old" == *@@HOMEBREW_* ]]; then install_name_tool -id "$(_reloc "$old")" "$f"; fi
44-
otool -l "$f" | awk '/cmd LC_RPATH/{getline; getline; print $2}' | grep '@@HOMEBREW_' | while IFS= read -r old; do
44+
otool -l "$f" | awk '/cmd LC_RPATH/{getline; getline; if ($2 ~ /@@HOMEBREW_/) print $2}' | while IFS= read -r old; do
4545
install_name_tool -rpath "$old" "$(_reloc "$old")" "$f"
4646
done
4747
codesign -f -s - "$f" 2>/dev/null || true # ad-hoc re-sign after editing

0 commit comments

Comments
 (0)