gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #197536 from eigengrau/zsh-init-no-unset

Browse Source 
nixos/zsh: don’t be noisy when scripts are run with -u
This commit is contained in:
Jörg Thalheim
2022-11-16 09:46:39 +01:00
committed by GitHub
parent 4e90099032 7d84dbdf5b
commit c48d83b7bf
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/modules/programs/zsh/zsh.nix
View File

@@ -173,10 +173,10 @@ in
# This file is read for all shells. # This file is read for all shells.
# Only execute this file once per shell. # 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 __ETC_ZSHENV_SOURCED=1
if [ -z "$__NIXOS_SET_ENVIRONMENT_DONE" ]; then if [ -z "''${__NIXOS_SET_ENVIRONMENT_DONE-}" ]; then
. ${config.system.build.setEnvironment} . ${config.system.build.setEnvironment}
fi fi
@@ -206,7 +206,7 @@ in
${zshStartupNotes} ${zshStartupNotes}
# Only execute this file once per shell. # 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 __ETC_ZPROFILE_SOURCED=1
# Setup custom login shell init stuff. # Setup custom login shell init stuff.