From 13b451b81d49f83d97c8d0471c9c6ae1785e9036 Mon Sep 17 00:00:00 2001 From: Ali Karbassi Date: Sun, 29 Mar 2020 10:27:43 -0500 Subject: [PATCH] Add support for macOS catalina date (#300) Co-authored-by: Benoit Sagols --- tests/test-lib.sh | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/tests/test-lib.sh b/tests/test-lib.sh index d5a7ac8f..18655bc0 100644 --- a/tests/test-lib.sh +++ b/tests/test-lib.sh @@ -495,19 +495,12 @@ test_init_todo () { #... if date --version 2>&1 | grep -q "GNU"; then DATE_STYLE=GNU - # on Mac OS X 10.15: - #date --version - #date: illegal option -- - - #usage: date [-jnRu] [-d dst] [-r seconds] [-t west] [-v[+|-]val[ymwdHMS]] ... - # [-f fmt date | [[[mm]dd]HH]MM[[cc]yy][.ss]] [+format] - elif date --version 2>&1 | grep -q -e "-jnRu"; then - DATE_STYLE=Mac10.15 # on Mac OS X 10.5: #date --version #date: illegal option -- - #usage: date [-jnu] [-d dst] [-r seconds] [-t west] [-v[+|-]val[ymwdHMS]] ... # [-f fmt date | [[[mm]dd]HH]MM[[cc]yy][.ss]] [+format] - elif date --version 2>&1 | grep -q -e "-jnu"; then + elif date --version 2>&1 | grep -q -e "-jnR\?u"; then DATE_STYLE=Mac10.5 # on Mac OS X 10.4: #date --version @@ -526,13 +519,6 @@ test_init_todo () { EOF chmod 755 bin/date ;; - Mac10.15) - cat > bin/date <<-EOF - #!/bin/sh - exec "$TODO_TEST_REAL_DATE" -j -f %s \$TODO_TEST_TIME \$@ - EOF - chmod 755 bin/date - ;; Mac10.5) cat > bin/date <<-EOF #!/bin/sh