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

bash: do not export HIST* variables

Browse source 
These are interpreted by the shell itself and it does not make sense
to export them to sub-processes.
This commit is contained in:
Robert Helgesson 2018-01-07 16:54:29 +01:00
parent 78c308c835
commit 8ab6298f30
No known key found for this signature in database
GPG key ID: C3DB11069E65DC86
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
modules/programs/bash.nix
View file

@ -132,8 +132,7 @@ in
); );
export = n: v: "export ${n}=\"${toString v}\""; export = n: v: "export ${n}=\"${toString v}\"";
exportIfNonNull = n: v: optionalString (v != null) (export n v); setIfNonEmpty = n: v: optionalString (v != "") "${n}=${toString v}";
exportIfNonEmpty = n: v: optionalString (v != "") (export n v);
histControlStr = concatStringsSep ":" cfg.historyControl; histControlStr = concatStringsSep ":" cfg.historyControl;
histIgnoreStr = concatStringsSep ":" cfg.historyIgnore; histIgnoreStr = concatStringsSep ":" cfg.historyIgnore;
@ -153,10 +152,10 @@ in
programs.bash.bashrcExtra = '' programs.bash.bashrcExtra = ''
# Commands that should be applied only for interactive shells. # Commands that should be applied only for interactive shells.
if [[ -n $PS1 ]]; then if [[ -n $PS1 ]]; then
${export "HISTSIZE" cfg.historySize} HISTSIZE=${toString cfg.historySize}
${export "HISTFILESIZE" cfg.historyFileSize} HISTFILESIZE=${toString cfg.historyFileSize}
${exportIfNonEmpty "HISTCONTROL" histControlStr} ${setIfNonEmpty "HISTCONTROL" histControlStr}
${exportIfNonEmpty "HISTIGNORE" histIgnoreStr} ${setIfNonEmpty "HISTIGNORE" histIgnoreStr}
${shoptsStr} ${shoptsStr}