From dea497f67a641d2d85f5673c3695f0fe43d46f64 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Tue, 10 Sep 2024 22:10:38 +0100
Subject: [PATCH 1/2] tests/networking-hostname: update for
 `lib.escapeShellArg` change

---
 tests/networking-hostname.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/networking-hostname.nix b/tests/networking-hostname.nix
index 3793958c..9e8c6fdd 100644
--- a/tests/networking-hostname.nix
+++ b/tests/networking-hostname.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ lib, config, pkgs, ... }:
 
 {
   networking.hostName = "EVE";
@@ -7,8 +7,8 @@
   test = ''
     echo checking hostname in /activate >&2
     grep "scutil --set ComputerName 'EVE’s MacBook Pro'" ${config.out}/activate
-    grep "scutil --set LocalHostName 'EVE'" ${config.out}/activate
-    grep "scutil --set HostName 'EVE'" ${config.out}/activate
+    grep "scutil --set LocalHostName ${lib.escapeShellArg "EVE"}" ${config.out}/activate
+    grep "scutil --set HostName ${lib.escapeShellArg "EVE"}" ${config.out}/activate
     echo checking defaults write in ${config.out}/activate-user >&2
   '';
 }

From 95f063ea069e1752ddede8c9823a1b75ddd7858a Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Tue, 10 Sep 2024 22:32:11 +0100
Subject: [PATCH 2/2] tests/users-groups: update for `lib.escapeShellArg`
 change

---
 tests/users-groups.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/users-groups.nix b/tests/users-groups.nix
index cefb1ad8..feaaf2bd 100644
--- a/tests/users-groups.nix
+++ b/tests/users-groups.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ lib, config, pkgs, ... }:
 
 {
   users.knownGroups = [ "foo" "created.group" "deleted.group" ];
@@ -46,9 +46,9 @@
     grep "dscl . -create '/Users/foo' IsHidden 0" ${config.out}/activate
     grep "dscl . -create '/Users/foo' RealName 'Foo user'" ${config.out}/activate
     grep "dscl . -create '/Users/foo' NFSHomeDirectory '/Users/foo'" ${config.out}/activate
-    grep "dscl . -create '/Users/foo' UserShell '/run/current-system/sw/bin/bash'" ${config.out}/activate
+    grep "dscl . -create '/Users/foo' UserShell ${lib.escapeShellArg "/run/current-system/sw/bin/bash"}" ${config.out}/activate
     grep "dscl . -create '/Users/created.user' UniqueID 42001" ${config.out}/activate
-    grep "dscl . -create '/Users/created.user' UserShell '/sbin/nologin'" ${config.out}/activate
+    grep "dscl . -create '/Users/created.user' UserShell ${lib.escapeShellArg "/sbin/nologin"}" ${config.out}/activate
     grep "createhomedir -cu 'foo'" ${config.out}/activate
     grep -qv "dscl . -delete '/Groups/created.user'" ${config.out}/activate