diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2022-11-16 09:46:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-16 09:46:39 +0100 |
| commit | c48d83b7bfefb38801a4f31caf57ac27e73abff0 (patch) | |
| tree | 11d2d05fc4074463bb045f681971f5e13a743757 | |
| parent | 4e90099032133fe03efc2e4efce1cacc05c30206 (diff) | |
| parent | 7d84dbdf5b91439f798363559310d86b21bfa86c (diff) | |
| download | nixpkgs-c48d83b7bfefb38801a4f31caf57ac27e73abff0.tar nixpkgs-c48d83b7bfefb38801a4f31caf57ac27e73abff0.tar.gz nixpkgs-c48d83b7bfefb38801a4f31caf57ac27e73abff0.tar.bz2 nixpkgs-c48d83b7bfefb38801a4f31caf57ac27e73abff0.tar.lz nixpkgs-c48d83b7bfefb38801a4f31caf57ac27e73abff0.tar.xz nixpkgs-c48d83b7bfefb38801a4f31caf57ac27e73abff0.tar.zst nixpkgs-c48d83b7bfefb38801a4f31caf57ac27e73abff0.zip | |
Merge pull request #197536 from eigengrau/zsh-init-no-unset
nixos/zsh: don’t be noisy when scripts are run with -u
| -rw-r--r-- | nixos/modules/programs/zsh/zsh.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix index cb55717b588..0b152e54cf9 100644 --- a/nixos/modules/programs/zsh/zsh.nix +++ b/nixos/modules/programs/zsh/zsh.nix @@ -173,10 +173,10 @@ in # This file is read for all shells. # Only execute this file once per shell. - if [ -n "$__ETC_ZSHENV_SOURCED" ]; then return; fi + if [ -n "''${__ETC_ZSHENV_SOURCED-}" ]; then return; fi __ETC_ZSHENV_SOURCED=1 - if [ -z "$__NIXOS_SET_ENVIRONMENT_DONE" ]; then + if [ -z "''${__NIXOS_SET_ENVIRONMENT_DONE-}" ]; then . ${config.system.build.setEnvironment} fi @@ -206,7 +206,7 @@ in ${zshStartupNotes} # Only execute this file once per shell. - if [ -n "$__ETC_ZPROFILE_SOURCED" ]; then return; fi + if [ -n "''${__ETC_ZPROFILE_SOURCED-}" ]; then return; fi __ETC_ZPROFILE_SOURCED=1 # Setup custom login shell init stuff. |