On Sat, Mar 24, 2018 at 3:53 AM, Eric Blake <[email protected]> wrote: > On 03/23/2018 06:53 PM, Jim Meyering wrote: >> >> On Fri, Mar 23, 2018 at 4:23 PM, Assaf Gordon <[email protected]> >> wrote: >>> >>> (adding bug-gnulib@ because of 'test-localename' failure) >>> > >>> Additionally, on Alpine linux which uses busybox's diff(1), >>> the following fails: >>> FAIL: test-version-etc.sh >>> ========================= >>> >>> diff: unrecognized option: c >>> FAIL test-version-etc.sh (exit status: 1) >> >> >> Wow. Thank you for all that prompt testing. > > >> >> @@ -36,7 +36,7 @@ EOT >> /^Packaged by/d >> 2,3 s/Copyright (C) [0-9]\{4,4\}/COPYRIGHT/' | >> tr -d '\015' | >> - diff -c $TMP - || ERR=1 >> + diff $TMP - || ERR=1 > > Is 'diff -u' portable to busybox? ed script diffs are a pain to read in > comparison to context or unified diffs, so I think this change is a > reduction in quality if something better is available.
Thanks. It can be better, indeed: use our very own init.sh, with its compare function. Done in the attached.
test-version-etc-use-init.sh.diff
Description: Binary data
