Merge pull request #3477 from Ninlives/nix-run-using-env

`nix run` using $SHELL as default command
This commit is contained in:
Eelco Dolstra 2020-04-08 19:35:39 +02:00 committed by GitHub
commit 5449ff7d8a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -59,14 +59,14 @@ struct RunCommon : virtual Command
struct CmdRun : InstallablesCommand, RunCommon, MixEnvironment struct CmdRun : InstallablesCommand, RunCommon, MixEnvironment
{ {
std::vector<std::string> command = { "bash" }; std::vector<std::string> command = { getEnv("SHELL").value_or("bash") };
CmdRun() CmdRun()
{ {
mkFlag() mkFlag()
.longName("command") .longName("command")
.shortName('c') .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"}) .labels({"command", "args"})
.arity(ArityAny) .arity(ArityAny)
.handler([&](std::vector<std::string> ss) { .handler([&](std::vector<std::string> ss) {