nrabulinski/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

nix-shell: Play nicely with non-interactive shells

Browse source 
nix-shell with the --command flag might be used non-interactively, but
if bash starts non-interactively (i.e. with stdin or stderr not a
terminal), it won't source the script given in --rcfile. However, in
that case it *will* source the script found in $BASH_ENV, so we can use
that instead.

Also, don't source ~/.bashrc in a non-interactive shell (detectable by
checking the PS1 env var)

Signed-off-by: Shea Levy <shea@shealevy.com>
This commit is contained in:
Shea Levy 2013-10-17 11:07:34 -04:00 committed by Eelco Dolstra
parent 792fd51f41
commit 4ea034a5c5
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scripts/nix-build.in
View file

@ -202,7 +202,8 @@ foreach my $expr (@exprs) {
my $rcfile = "$tmpDir/rc"; my $rcfile = "$tmpDir/rc";
writeFile( writeFile(
$rcfile, $rcfile,
'[ -e ~/.bashrc ] && source ~/.bashrc; ' . 'unset BASH_ENV; ' .
'[ -n "$PS1" ] && [ -e ~/.bashrc ] && source ~/.bashrc; ' .
($pure ? '' : 'p=$PATH; ' ) . ($pure ? '' : 'p=$PATH; ' ) .
'dontAddDisableDepTrack=1; ' . 'dontAddDisableDepTrack=1; ' .
'[ -e $stdenv/setup ] && source $stdenv/setup; ' . '[ -e $stdenv/setup ] && source $stdenv/setup; ' .
@ -212,6 +213,7 @@ foreach my $expr (@exprs) {
'unset NIX_ENFORCE_PURITY; ' . 'unset NIX_ENFORCE_PURITY; ' .
'shopt -u nullglob; ' . 'shopt -u nullglob; ' .
$envCommand); $envCommand);
$ENV{BASH_ENV} = $rcfile;
exec($ENV{NIX_BUILD_SHELL} // "bash", "--rcfile", $rcfile); exec($ENV{NIX_BUILD_SHELL} // "bash", "--rcfile", $rcfile);
die; die;
} }