diff options
| author | Michael Hoang <enzime@users.noreply.github.com> | 2024-10-22 09:43:19 +1100 |
|---|---|---|
| committer | Michael Hoang <enzime@users.noreply.github.com> | 2024-10-22 16:02:21 +1100 |
| commit | 7bb6366f40dd4ef6efe3223e6dffb3dd7f8dea66 (patch) | |
| tree | 7af8cd199dba63cd4e1d95054131445e28e86447 | |
| parent | 26f7e45fb117171c9e8b27a34cfccb91ef50f068 (diff) | |
users: use `lib.escapeShellArgs` instead of custom version
| -rw-r--r-- | modules/users/default.nix | 3 | ||||
| -rw-r--r-- | tests/users-groups.nix | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/modules/users/default.nix b/modules/users/default.nix index f43b139..90e5534 100644 --- a/modules/users/default.nix +++ b/modules/users/default.nix @@ -8,7 +8,6 @@ let group = import ./group.nix; user = import ./user.nix; - toArguments = concatMapStringsSep " " (v: "'${v}'"); toGID = v: { "${toString v.gid}" = v.name; }; toUID = v: { "${toString v.uid}" = v.name; }; @@ -121,7 +120,7 @@ in g=$(dscl . -read '/Groups/${v.name}' GroupMembership 2> /dev/null) || true if [ "$g" != 'GroupMembership: ${concatStringsSep " " v.members}' ]; then echo "updating group members ${v.name}..." >&2 - dscl . -create '/Groups/${v.name}' GroupMembership ${toArguments v.members} + dscl . -create '/Groups/${v.name}' GroupMembership ${lib.escapeShellArgs v.members} fi else echo "[1;31mwarning: existing group '${v.name}' has unexpected gid $g, skipping...[0m" >&2 diff --git a/tests/users-groups.nix b/tests/users-groups.nix index bdbabe1..17b8c0d 100644 --- a/tests/users-groups.nix +++ b/tests/users-groups.nix @@ -35,7 +35,7 @@ grep -qv "dscl . -create '/Groups/deleted.group'" ${config.out}/activate echo "checking group membership in /activate" >&2 - grep "dscl . -create '/Groups/foo' GroupMembership 'admin' 'foo'" ${config.out}/activate + grep "dscl . -create '/Groups/foo' GroupMembership ${lib.escapeShellArgs [ "admin" "foo" ]}" ${config.out}/activate grep "dscl . -create '/Groups/created.group' GroupMembership" ${config.out}/activate # checking unknown group in /activate |