diff options
| author | Théophane Hufschmitt <7226587+thufschmitt@users.noreply.github.com> | 2023-05-25 18:15:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-25 18:15:42 +0200 |
| commit | f41dd2c306a5986340b04c1635bd674e4a01b78d (patch) | |
| tree | 9a77877dbdf3a039a8984e2676dbf1afdb1174c6 | |
| parent | 6e4570234d5ac63a9483fb7f7aabaa1d17561a3a (diff) | |
| parent | 367fcd9eb590d002cbbae23f22b1395b7d3303e6 (diff) | |
Merge pull request #7948 from mkenigs/ventura-diff
installer: don't assume GNU diff
| -rw-r--r-- | scripts/install-multi-user.sh | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/scripts/install-multi-user.sh b/scripts/install-multi-user.sh index 7c66538b0..79deb2819 100644 --- a/scripts/install-multi-user.sh +++ b/scripts/install-multi-user.sh @@ -246,8 +246,15 @@ printf -v _OLD_LINE_FMT "%b" $'\033[1;7;31m-'"$ESC ${RED}%L${ESC}" printf -v _NEW_LINE_FMT "%b" $'\033[1;7;32m+'"$ESC ${GREEN}%L${ESC}" _diff() { + # macOS Ventura doesn't ship with GNU diff. Print similar output except + # without +/- markers or dimming + if diff --version | grep -q "Apple diff"; then + printf -v CHANGED_GROUP_FORMAT "%b" "${GREEN}%>${RED}%<${ESC}" + diff --changed-group-format="$CHANGED_GROUP_FORMAT" "$@" + else # simple colorized diff comatible w/ pre `--color` versions - diff --unchanged-group-format="$_UNCHANGED_GRP_FMT" --old-line-format="$_OLD_LINE_FMT" --new-line-format="$_NEW_LINE_FMT" --unchanged-line-format=" %L" "$@" + diff --unchanged-group-format="$_UNCHANGED_GRP_FMT" --old-line-format="$_OLD_LINE_FMT" --new-line-format="$_NEW_LINE_FMT" --unchanged-line-format=" %L" "$@" + fi } confirm_rm() { |