Check if diff supports the --strip-trailing-cr option

OSGeo · Aug 13, 2024 · d3d8de3 · d3d8de3
1 parent f512a23
commit d3d8de3
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/contrib/tests/shpproj.sh b/contrib/tests/shpproj.sh
@@ -21,12 +21,12 @@ readonly SCRIPTDIR=$(dirname "$0")
 
 "${SHPDUMP:-$top_builddir/shpdump}" -precision 8 "test" > "test.out"
 
-is_windows() {
-	[ -n "$WINDIR" ] || uname | grep -q "MINGW"
+supports_strip_trailing_cr() {
+	diff --help 2>/dev/null | grep -q -- '--strip-trailing-cr'
 }
 
 run_diff() {
-	if is_windows; then
+	if supports_strip_trailing_cr; then
 		diff --strip-trailing-cr "$SCRIPTDIR/expect.out" "test.out"
 	else
 		diff "$SCRIPTDIR/expect.out" "test.out"