From 5b12679988d0ed7333e337705e1d42ce019cbd05 Mon Sep 17 00:00:00 2001 From: Ben Donatelli Date: Fri, 26 Mar 2021 20:38:15 -0500 Subject: [PATCH] Make reorder level winnable on macOS platforms by using perl instead of grep macOS provides BSD grep which does not support -P flag. Perl pattern match works on all platforms. Fixes git-learning-game/oh-my-git#79 --- levels/changing-the-past/reorder | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/levels/changing-the-past/reorder b/levels/changing-the-past/reorder index 1b0d4c1..04f66cb 100644 --- a/levels/changing-the-past/reorder +++ b/levels/changing-the-past/reorder @@ -71,7 +71,7 @@ git commit -am "Put on shirt" [win] # Reorder the commits to dress yourself in the correct way -{ git log main --oneline | LC_ALL=en_US.utf8 grep -Pz "shoes[\s\S]*pants[\s\S]*underwear"; } && { test "$(git log main --oneline | wc -l)" -eq 5; } +{ git log main --oneline | perl -0777 -ne'exit(1) if not /shoes[\s\S]*pants[\s\S]*underwear/'; } && { test "$(git log main --oneline | wc -l)" -eq 5; } [congrats]