diff options
author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2017-01-07T17·08+0200 |
---|---|---|
committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2017-01-07T17·08+0200 |
commit | 3890de049dff68b85ddb1e21c91e16561bc668ce (patch) | |
tree | 51952fc35d2150fff30e41a7f10df6ab060565b4 /src/nix-build/nix-build.cc | |
parent | 9000150a784d05a76455886b1ad8a95e0cff2115 (diff) |
nix-shell: Fix 'nix-shell --command' doing nothing without TTY
Regression from a5f2750e ("Fix early removal of rc-file for nix-shell"). The removal of BASH_ENV causes nothing to be executed by bash if it detects itself in a non-interactive context. Instead, just use the same condition used by bash to launch bash differently. According to bash sources, the condition (stdin and stder both must be TTYs) is specified by POSIX so this should be pretty safe to rely on. Fixes #1171 on master, needs a backport to the Perl code in 1.11.
Diffstat (limited to '')
-rwxr-xr-x | src/nix-build/nix-build.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/nix-build/nix-build.cc b/src/nix-build/nix-build.cc index c67148728722..71ef5af86af9 100755 --- a/src/nix-build/nix-build.cc +++ b/src/nix-build/nix-build.cc @@ -81,7 +81,8 @@ int main(int argc, char ** argv) auto pure = false; auto fromArgs = false; auto packages = false; - auto interactive = true; + // Same condition as bash uses for interactive shells + auto interactive = isatty(STDIN_FILENO) && isatty(STDERR_FILENO); Strings instArgs; Strings buildArgs; |