mirrors/nix-darwin
1
0
Fork 0
mirror of https://github.com/LnL7/nix-darwin.git synced 2024-12-14 11:57:34 +00:00
Code Activity

users: use lib.escapeShellArg for id -u

Browse source
This commit is contained in:
Michael Hoang 2024-10-22 06:58:23 +11:00
parent 5b873c48ac
commit 9a6b12b9ef
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
modules/users/default.nix
View file

@ -147,7 +147,7 @@ in
${concatMapStringsSep "\n" (v: '' ${concatMapStringsSep "\n" (v: ''
${optionalString cfg.forceRecreate '' ${optionalString cfg.forceRecreate ''
u=$(id -u '${v.name}' 2> /dev/null) || true u=$(id -u ${lib.escapeShellArg v.name} 2> /dev/null) || true
if [[ "$u" -eq ${toString v.uid} ]]; then if [[ "$u" -eq ${toString v.uid} ]]; then
echo "deleting user ${v.name}..." >&2 echo "deleting user ${v.name}..." >&2
sysadminctl -deleteUser '${v.name}' 2> /dev/null sysadminctl -deleteUser '${v.name}' 2> /dev/null
@ -156,7 +156,7 @@ in
fi fi
''} ''}
u=$(id -u '${v.name}' 2> /dev/null) || true u=$(id -u ${lib.escapeShellArg v.name} 2> /dev/null) || true
if [[ -n "$u" && "$u" -ne "${toString v.uid}" ]]; then if [[ -n "$u" && "$u" -ne "${toString v.uid}" ]]; then
echo "warning: existing user '${v.name}' has unexpected uid $u, skipping..." >&2 echo "warning: existing user '${v.name}' has unexpected uid $u, skipping..." >&2
else else
@ -177,7 +177,7 @@ in
'') createdUsers} '') createdUsers}
${concatMapStringsSep "\n" (name: '' ${concatMapStringsSep "\n" (name: ''
u=$(id -u '${name}' 2> /dev/null) || true u=$(id -u ${lib.escapeShellArg name} 2> /dev/null) || true
if [ -n "$u" ]; then if [ -n "$u" ]; then
if [ "$u" -gt 501 ]; then if [ "$u" -gt 501 ]; then
echo "deleting user ${name}..." >&2 echo "deleting user ${name}..." >&2