nathan/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager.git synced 2026-06-05 21:02:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

zsh: guard session variables under nounset

Browse Source 
Use parameter expansion with a default value when checking Home Manager's session-variable sentinels.

Users with zsh NO_UNSET or shell nounset enabled were seeing parameter-not-set errors before the generated session variables had a chance to export the sentinel variables.

Update the home session-variable and zsh fixtures to cover the generated guards.
This commit is contained in:
Austin Horstman
2026-05-14 20:20:23 -05:00
parent 32b42d71b4
commit d5ece85b6d
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/home-environment.nix
View File

@@ -657,7 +657,7 @@ in
destination = "/etc/profile.d/hm-session-vars.sh"; destination = "/etc/profile.d/hm-session-vars.sh";
text = '' text = ''
# Only source this once. # Only source this once.
if [ -n "$__HM_SESS_VARS_SOURCED" ]; then return; fi if [ -n "''${__HM_SESS_VARS_SOURCED-}" ]; then return; fi
export __HM_SESS_VARS_SOURCED=1 export __HM_SESS_VARS_SOURCED=1
${config.lib.shell.exportAll cfg.sessionVariables} ${config.lib.shell.exportAll cfg.sessionVariables}

2
modules/programs/zsh/default.nix
View File

@@ -486,7 +486,7 @@ in
. "${config.home.sessionVariablesPackage}/etc/profile.d/hm-session-vars.sh" . "${config.home.sessionVariablesPackage}/etc/profile.d/hm-session-vars.sh"
# Only source this once # Only source this once
if [[ -z "$__HM_ZSH_SESS_VARS_SOURCED" ]]; then if [[ -z "''${__HM_ZSH_SESS_VARS_SOURCED-}" ]]; then
export __HM_ZSH_SESS_VARS_SOURCED=1 export __HM_ZSH_SESS_VARS_SOURCED=1
${envVarsStr} ${envVarsStr}
fi fi

4
tests/modules/home-environment/session-variables.nix
View File

@@ -6,7 +6,7 @@ let
linuxExpected = '' linuxExpected = ''
# Only source this once. # Only source this once.
if [ -n "$__HM_SESS_VARS_SOURCED" ]; then return; fi if [ -n "''${__HM_SESS_VARS_SOURCED-}" ]; then return; fi
export __HM_SESS_VARS_SOURCED=1 export __HM_SESS_VARS_SOURCED=1
export IS_EMPTY="" export IS_EMPTY=""
@@ -25,7 +25,7 @@ let
darwinExpected = '' darwinExpected = ''
# Only source this once. # Only source this once.
if [ -n "$__HM_SESS_VARS_SOURCED" ]; then return; fi if [ -n "''${__HM_SESS_VARS_SOURCED-}" ]; then return; fi
export __HM_SESS_VARS_SOURCED=1 export __HM_SESS_VARS_SOURCED=1
export IS_EMPTY="" export IS_EMPTY=""

2
tests/modules/programs/zsh/session-variables.zshenv
View File

@@ -2,7 +2,7 @@
. "/nix/store/00000000000000000000000000000000-hm-session-vars.sh/etc/profile.d/hm-session-vars.sh" . "/nix/store/00000000000000000000000000000000-hm-session-vars.sh/etc/profile.d/hm-session-vars.sh"
# Only source this once # Only source this once
if [[ -z "$__HM_ZSH_SESS_VARS_SOURCED" ]]; then if [[ -z "${__HM_ZSH_SESS_VARS_SOURCED-}" ]]; then
export __HM_ZSH_SESS_VARS_SOURCED=1 export __HM_ZSH_SESS_VARS_SOURCED=1
export IS_EMPTY="" export IS_EMPTY=""
export IS_FALSE=false export IS_FALSE=false