diff options
author | Eelco Dolstra <edolstra@gmail.com> | 2020-04-09 15:54:21 +0200 |
---|---|---|
committer | Eelco Dolstra <edolstra@gmail.com> | 2020-04-09 15:54:21 +0200 |
commit | d103c79144723d95eb3650593ad4d3e96abe59d3 (patch) | |
tree | 44bc23261fe42a60afa666ab770cf8d7f55c5138 /src/nix/run.cc | |
parent | 03a4a3c95cf0e10cd05c1c4ce9dd35c9fc64c331 (diff) | |
parent | 30d4618cc944a41c2ca202babd0be0da4a1cd9d2 (diff) |
Merge remote-tracking branch 'origin/master' into flakes
Diffstat (limited to 'src/nix/run.cc')
-rw-r--r-- | src/nix/run.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nix/run.cc b/src/nix/run.cc index 7fd9c4c7e..901b87fbb 100644 --- a/src/nix/run.cc +++ b/src/nix/run.cc @@ -59,14 +59,14 @@ struct RunCommon : virtual Command struct CmdRun : InstallablesCommand, RunCommon, MixEnvironment { - std::vector<std::string> command = { "bash" }; + std::vector<std::string> command = { getEnv("SHELL").value_or("bash") }; CmdRun() { mkFlag() .longName("command") .shortName('c') - .description("command and arguments to be executed; defaults to 'bash'") + .description("command and arguments to be executed; defaults to '$SHELL'") .labels({"command", "args"}) .arity(ArityAny) .handler([&](std::vector<std::string> ss) { |