deprecating --shell (2) (#5196)

3 files changed, 1 insertions, 3 deletions

diff --git a/src/fbuilder/build_profile.c b/src/fbuilder/build_profile.c
index 24cb4472c..d57db7f42 100644
--- a/src/fbuilder/build_profile.c
+++ b/src/fbuilder/build_profile.c
@@ -53,7 +53,6 @@ void build_profile(int argc, char **argv, int index, FILE *fp) {
         cmd[curr_len++] = "--noprofile";
         cmd[curr_len++] = "--caps.drop=all";
         cmd[curr_len++] = "--seccomp=!chroot";
-        cmd[curr_len++] = "--shell=none";
         cmd[curr_len++] = output;
         if (arg_appimage)
                 cmd[curr_len++] = "--appimage";
diff --git a/src/firejail/sandbox.c b/src/firejail/sandbox.c
index 6b84faf13..5b9606fbd 100644
--- a/src/firejail/sandbox.c
+++ b/src/firejail/sandbox.c
@@ -565,6 +565,7 @@ void start_application(int no_sandbox, int fd, char *set_sandbox_status) {
         else { // appimage
                 char *arg[5];
                 int index = 0;
+                assert(cfg.usershell);
                 arg[index++] = cfg.usershell;
                 if (cfg.command_line) {
                         if (arg_debug)
diff --git a/src/firejail/usage.c b/src/firejail/usage.c
index c379c2ab4..14cd1f3a4 100644
--- a/src/firejail/usage.c
+++ b/src/firejail/usage.c
@@ -242,8 +242,6 @@ static char *usage_str =
         "    --seccomp.32[.drop,.keep][=syscall] - like above but for 32 bit architecture.\n"
         "    --seccomp-error-action=errno|kill|log - change error code, kill process\n"
         "\tor log the attempt.\n"
-        "    --shell=none - run the program directly without a user shell.\n"
-        "    --shell=program - set default user shell.\n"
         "    --shutdown=name|pid - shutdown the sandbox identified by name or PID.\n"
         "    --tab - enable shell tab completion in sandboxes using private or\n"
         "\twhitelisted home directories.\n"