Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/src/checkpkg.in
diff options
context:
space:
mode:
authorJakub Klinkovský <lahwaacz@archlinux.org>2024-06-17 21:03:33 +0200
committerJakub Klinkovský <lahwaacz@archlinux.org>2024-06-26 07:40:12 +0200
commitd6d416b653c339043ac3ee429b526af481521564 (patch)
tree8f9272539be20b7401ce6e55ddae0054092e43e6 /src/checkpkg.in
parent9ff63503b94e7f523cba1a5f9e5dfdc9c8855471 (diff)
feat(checkpkg): enhance diff command for comparing file lists
Replace `sdiff` with `diff` (also from `diffutils`) with the following parameters: - `--side-by-side` for the `sdiff`-like output - `--suppress-common-lines` for the `sdiff -s` behavior - `--width="$COLUMNS"` to use the full terminal width (long lines are still truncated but it is definitely better than the default width of 130 chars) - `--color=auto` just because 😉
Diffstat (limited to 'src/checkpkg.in')
-rw-r--r--src/checkpkg.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/checkpkg.in b/src/checkpkg.in
index ccb7259..6ee18c6 100644
--- a/src/checkpkg.in
+++ b/src/checkpkg.in
@@ -140,7 +140,7 @@ for _pkgname in "${pkgname[@]}"; do
bsdtar tf "$TEMPDIR/$oldpkg" | sort > "$TEMPDIR/filelist-$_pkgname-old"
bsdtar tf "$pkgfile" | sort > "$TEMPDIR/filelist-$_pkgname"
- sdiff -s "$TEMPDIR/filelist-$_pkgname-old" "$TEMPDIR/filelist-$_pkgname"
+ diff --side-by-side --suppress-common-lines --width="$COLUMNS" --color=auto "$TEMPDIR/filelist-$_pkgname-old" "$TEMPDIR/filelist-$_pkgname"
find-libprovides "$TEMPDIR/$oldpkg" 2>/dev/null | sort > "$TEMPDIR/libraries-$_pkgname-old"
find-libprovides "$pkgfile" 2>/dev/null | sort > "$TEMPDIR/libraries-$_pkgname"