picnoir
/
Nix
1
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

Use a looser comparison for the 'user note' check 

We use grep instead of an equality check because it is difficult
to extract _just_ the user's note, instead it is prefixed with
some plist junk. This was causing the user note to always be set,
even if there was no reason for it.
This commit is contained in:
Graham Christensen 2018-03-30 11:38:08 -04:00
parent 4ba91f5bae
commit f06f8102bd
No known key found for this signature in database
GPG Key ID: ACA1C1D120C83D5C
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/install-multi-user.sh
View File

@ -483,7 +483,11 @@ EOF
row " Home Directory" "/var/empty"
fi
if [ "$(poly_user_note_get "$username")" = "Nix build user $coreid" ]; then
# We use grep instead of an equality check because it is difficult
# to extract _just_ the user's note, instead it is prefixed with
# some plist junk. This was causing the user note to always be set,
# even if there was no reason for it.
if ! poly_user_note_get "$username" | grep -q "Nix build user $coreid"; then
row " Note" "Nix build user $coreid"
else
poly_user_note_set "$username" "Nix build user $coreid"