modif: drop deprecated 'shell' option references (#5894)

The `shell` option has been removed. Remove stale references.

This does NOT remove `shell none`-related code comments in:

- src/firejail/fs_lib.c (L433-L441)
- src/firejail/join.c (L415-L417)

Relates to #5196.

Suggested by #5891.

6 files changed, 3 insertions, 15 deletions

diff --git a/src/bash_completion/firejail.bash_completion.in b/src/bash_completion/firejail.bash_completion.in
index 8e047ce90..98e3a035e 100644
--- a/src/bash_completion/firejail.bash_completion.in
+++ b/src/bash_completion/firejail.bash_completion.in
@@ -82,10 +82,6 @@ _firejail()
             _filedir
             return 0
             ;;
-        --shell)
-            _filedir
-            return 0
-            ;;
         --net)
             comps=$(__interfaces)
             COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
diff --git a/src/fbuilder/build_profile.c b/src/fbuilder/build_profile.c
index 75f1c10d7..96ddd79fb 100644
--- a/src/fbuilder/build_profile.c
+++ b/src/fbuilder/build_profile.c
@@ -143,7 +143,6 @@ void build_profile(int argc, char **argv, int index, FILE *fp) {
                 fprintf(fp, "#novideo\t# disable video capture devices\n");
                 build_protocol(trace_output, fp);
                 fprintf(fp, "seccomp !chroot\t# allowing chroot, just in case this is an Electron app\n");
-                fprintf(fp, "shell none\n");
                 fprintf(fp, "#tracelog\t# send blacklist violations to syslog\n");
                 fprintf(fp, "\n");
 
diff --git a/src/firejail/main.c b/src/firejail/main.c
index 45b199db4..b0d5dac17 100644
--- a/src/firejail/main.c
+++ b/src/firejail/main.c
@@ -2806,7 +2806,7 @@ int main(int argc, char **argv, char **envp) {
                         // already handled
                 }
                 else if (strncmp(argv[i], "--shell=", 8) == 0) {
-                        fprintf(stderr, "Warning: --shell feature has been deprecated\n");
+                        fprintf(stderr, "Error: \"shell none\" is done by default now; the \"shell\" command has been removed\n");
                         exit(1);
                 }
                 else if (strcmp(argv[i], "-c") == 0) {
diff --git a/src/firejail/profile.c b/src/firejail/profile.c
index 07449f646..bdaaed433 100644
--- a/src/firejail/profile.c
+++ b/src/firejail/profile.c
@@ -371,8 +371,8 @@ int profile_check_line(char *ptr, int lineno, const char *fname) {
                 arg_caps_drop_all = 1;
                 return 0;
         }
-        else if (strcmp(ptr, "shell none") == 0) {
-                fprintf(stderr, "Warning: \"shell none\" command in the profile file is done by default; the command will be deprecated\n");
+        else if (strcmp(ptr, "shell ") == 0) {
+                fprintf(stderr, "Warning: \"shell none\" is done by default now; the \"shell\" command has been removed\n");
                 return 0;
         }
         else if (strcmp(ptr, "tracelog") == 0) {
diff --git a/src/man/firejail-profile.5.in b/src/man/firejail-profile.5.in
index fa294d888..3a678b14f 100644
--- a/src/man/firejail-profile.5.in
+++ b/src/man/firejail-profile.5.in
@@ -799,11 +799,6 @@ Disable video capture devices.
 .TP
 \fBmachine-id
 Spoof id number in /etc/machine-id file - a new random id is generated inside the sandbox.
-.TP
-\fBshell none
-Run the program directly, without a shell.
-
-
 #ifdef HAVE_NETWORK
 .SH Networking
 Networking features available in profile files.
diff --git a/src/zsh_completion/_firejail.in b/src/zsh_completion/_firejail.in
index 455ba7e50..7e87bb991 100644
--- a/src/zsh_completion/_firejail.in
+++ b/src/zsh_completion/_firejail.in
@@ -160,8 +160,6 @@ _firejail_args=(
     '*--seccomp.32.keep=-[enable seccomp filter, and whitelist the 32 bit syscalls specified by the command]: :'
     # FIXME: Add errnos
     '--seccomp-error-action=-[change error code, kill process or log the attempt]: :(kill log)'
-    '--shell=none[run the program directly without a user shell]'
-    '--shell=-[set default user shell]: :_values $(cat /etc/shells)'
     '--timeout=-[kill the sandbox automatically after the time has elapsed]: :'
     #'(--tracelog)--trace[trace open, access and connect system calls]'
     '(--tracelog)--trace=-[trace open, access and connect system calls]: :_files'