Merge #441

bors[bot] · Chris Montgomery · web-flow · commit 8b88f511dbef · 2022-03-05T21:15:50.000Z
441: fix: use gnu sed in shell tests for cross-platform compatibility r=montchr a=montchr Darwin's use of BSD `sed` breaks here because BSD `sed` has a different argument signature. Spun off from #438 as suggested in #438 (comment) Co-authored-by: Chris Montgomery <chris@alley.co>
diff --git a/shell.nix b/shell.nix
@@ -52,13 +52,13 @@ let
           git rm -f flake.lock
         fi
         # ensure: restore input
-        [ -z $diggaurl ] || sed -i "s|$tempdigga|$diggaurl|g" flake.nix
+        [ -z $diggaurl ] || ${pkgs.gnused}/bin/sed -i "s|$tempdigga|$diggaurl|g" flake.nix
       }
 
       digga_fixture() {
         # ensure: replace input
         diggaurl=$({ grep -o '"github:divnix/digga.*"' flake.nix || true; })
-        [ -z $diggaurl ] || sed -i "s|$diggaurl|$tempdigga|g" flake.nix
+        [ -z $diggaurl ] || ${pkgs.gnused}/bin/sed -i "s|$diggaurl|$tempdigga|g" flake.nix
       }
 
       trap_err() {

Original file line number	Diff line number	Diff line change
`@@ -52,13 +52,13 @@ let`
`52`	`52`	`git rm -f flake.lock`
`53`	`53`	`fi`
`54`	`54`	`# ensure: restore input`
`55`		`- [ -z $diggaurl ] \|\| sed -i "s\|$tempdigga\|$diggaurl\|g" flake.nix`
	`55`	`+ [ -z $diggaurl ] \|\| ${pkgs.gnused}/bin/sed -i "s\|$tempdigga\|$diggaurl\|g" flake.nix`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`digga_fixture() {`
`59`	`59`	`# ensure: replace input`
`60`	`60`	`diggaurl=$({ grep -o '"github:divnix/digga.*"' flake.nix \|\| true; })`
`61`		`- [ -z $diggaurl ] \|\| sed -i "s\|$diggaurl\|$tempdigga\|g" flake.nix`
	`61`	`+ [ -z $diggaurl ] \|\| ${pkgs.gnused}/bin/sed -i "s\|$diggaurl\|$tempdigga\|g" flake.nix`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`trap_err() {`