Skip to content

Commit f41dd2c

Browse files
authored
Merge pull request #7948 from mkenigs/ventura-diff
installer: don't assume GNU diff
2 parents 6e45702 + 367fcd9 commit f41dd2c

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

scripts/install-multi-user.sh

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,8 +246,15 @@ printf -v _OLD_LINE_FMT "%b" $'\033[1;7;31m-'"$ESC ${RED}%L${ESC}"
246246
printf -v _NEW_LINE_FMT "%b" $'\033[1;7;32m+'"$ESC ${GREEN}%L${ESC}"
247247

248248
_diff() {
249+
# macOS Ventura doesn't ship with GNU diff. Print similar output except
250+
# without +/- markers or dimming
251+
if diff --version | grep -q "Apple diff"; then
252+
printf -v CHANGED_GROUP_FORMAT "%b" "${GREEN}%>${RED}%<${ESC}"
253+
diff --changed-group-format="$CHANGED_GROUP_FORMAT" "$@"
254+
else
249255
# simple colorized diff comatible w/ pre `--color` versions
250-
diff --unchanged-group-format="$_UNCHANGED_GRP_FMT" --old-line-format="$_OLD_LINE_FMT" --new-line-format="$_NEW_LINE_FMT" --unchanged-line-format=" %L" "$@"
256+
diff --unchanged-group-format="$_UNCHANGED_GRP_FMT" --old-line-format="$_OLD_LINE_FMT" --new-line-format="$_NEW_LINE_FMT" --unchanged-line-format=" %L" "$@"
257+
fi
251258
}
252259

253260
confirm_rm() {

0 commit comments

Comments
 (0)