From 775294baf4118fa3430eca05efa41b051a7c3e89 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Tue, 20 Jan 2026 21:51:51 +0100 Subject: [PATCH] home-manager: simplify error messages slightly --- home-manager/po/home-manager.pot | 2 +- modules/lib-bash/activation-init.sh | 6 +++--- modules/po/hm-modules.pot | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/home-manager/po/home-manager.pot b/home-manager/po/home-manager.pot index 7c19711d..c74e70e6 100644 --- a/home-manager/po/home-manager.pot +++ b/home-manager/po/home-manager.pot @@ -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 \n" "Language-Team: LANGUAGE \n" diff --git a/modules/lib-bash/activation-init.sh b/modules/lib-bash/activation-init.sh index 20223c01..0054be42 100755 --- a/modules/lib-bash/activation-init.sh +++ b/modules/lib-bash/activation-init.sh @@ -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 } diff --git a/modules/po/hm-modules.pot b/modules/po/hm-modules.pot index 85e4a06d..d8b5d3d1 100644 --- a/modules/po/hm-modules.pot +++ b/modules/po/hm-modules.pot @@ -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 \n" "Language-Team: LANGUAGE \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