diff options
| author |  netblue30 <netblue30@yahoo.com> | 2016-08-14 08:45:25 -0400 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2016-08-14 08:45:25 -0400 |
| commit | fd47862fae009368641b1f64153e3184e7966f18 (patch) | |
| tree | 9a924753bcfe368fcdef79207439aac716e59e6f /src/firejail/env.c | |
| parent | Merge pull request #711 from Fred-Barclay/sandy_shores (diff) | |
| parent | join fixes (diff) | |
| download | firejail-fd47862fae009368641b1f64153e3184e7966f18.tar.gz firejail-fd47862fae009368641b1f64153e3184e7966f18.tar.zst firejail-fd47862fae009368641b1f64153e3184e7966f18.zip | |
Merge pull request #709 from manevich/shell
Gather shell selection code in one place
Diffstat (limited to 'src/firejail/env.c')
| -rw-r--r-- | src/firejail/env.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/firejail/env.c b/src/firejail/env.c index dd51b0a78..328b19c5b 100644 --- a/src/firejail/env.c +++ b/src/firejail/env.c | |||
| @@ -121,10 +121,6 @@ void env_defaults(void) { | |||
| 121 | errExit("setenv"); | 121 | errExit("setenv"); |
| 122 | if (setenv("container", "firejail", 1) < 0) // LXC sets container=lxc, | 122 | if (setenv("container", "firejail", 1) < 0) // LXC sets container=lxc, |
| 123 | errExit("setenv"); | 123 | errExit("setenv"); |
| 124 | if (arg_zsh && setenv("SHELL", "/usr/bin/zsh", 1) < 0) | ||
| 125 | errExit("setenv"); | ||
| 126 | if (arg_csh && setenv("SHELL", "/bin/csh", 1) < 0) | ||
| 127 | errExit("setenv"); | ||
| 128 | if (cfg.shell && setenv("SHELL", cfg.shell, 1) < 0) | 124 | if (cfg.shell && setenv("SHELL", cfg.shell, 1) < 0) |
| 129 | errExit("setenv"); | 125 | errExit("setenv"); |
| 130 | // set prompt color to green | 126 | // set prompt color to green |