nix/2.home-manager
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

home-manager: simplify error messages slightly

Browse source
This commit is contained in:
Robert Helgesson 2026-01-20 21:51:51 +01:00
parent a50511b63f
commit 775294baf4
No known key found for this signature in database
GPG key ID: 96E745BD17AA17ED
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
home-manager/po/home-manager.pot
View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Home Manager\n"
"Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
"POT-Creation-Date: 2026-01-20 13:03+0100\n"
"POT-Creation-Date: 2026-01-20 21:51+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"

6
modules/lib-bash/activation-init.sh
View file

@ -103,7 +103,7 @@ function checkUsername() {
local expectedUser="$1"
if [[ "$USER" != "$expectedUser" ]]; then
_iError 'Environment variable USER is set to "%s" but we expect "%s"' "$USER" "$expectedUser"
_iError 'USER is set to "%s" but we expect "%s"' "$USER" "$expectedUser"
exit 1
fi
}
@ -112,7 +112,7 @@ function checkHomeDirectory() {
local expectedHome="$1"
if ! [[ $HOME -ef $expectedHome ]]; then
_iError 'Environment variable HOME is set to "%s" but we expect "%s"' "$HOME" "$expectedHome"
_iError 'HOME is set to "%s" but we expect "%s"' "$HOME" "$expectedHome"
exit 1
fi
}
@ -123,7 +123,7 @@ function checkUid() {
actualUid="$(id -u)"
if [[ "$actualUid" != "$expectedUid" ]]; then
_iError 'Environment variable UID is "%s" but we expect "%s"' "$actualUid" "$expectedUid"
_iError 'UID is "%s" but we expect "%s"' "$actualUid" "$expectedUid"
exit 1
fi
}

8
modules/po/hm-modules.pot
View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Home Manager Modules\n"
"Report-Msgid-Bugs-To: https://github.com/nix-community/home-manager/issues\n"
"POT-Creation-Date: 2026-01-20 13:03+0100\n"
"POT-Creation-Date: 2026-01-20 21:51+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -66,15 +66,15 @@ msgid "Could not find suitable profile directory, tried %s and %s"
msgstr ""
#: modules/lib-bash/activation-init.sh:106
msgid "Environment variable USER is set to \"%s\" but we expect \"%s\""
msgid "USER is set to \"%s\" but we expect \"%s\""
msgstr ""
#: modules/lib-bash/activation-init.sh:115
msgid "Environment variable HOME is set to \"%s\" but we expect \"%s\""
msgid "HOME is set to \"%s\" but we expect \"%s\""
msgstr ""
#: modules/lib-bash/activation-init.sh:126
msgid "Environment variable UID is \"%s\" but we expect \"%s\""
msgid "UID is \"%s\" but we expect \"%s\""
msgstr ""
#: modules/lib-bash/activation-init.sh:143