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, 7 insertions, 12 deletions

diff --git a/test/environment/shell-none.profile b/test/environment/shell-none.profile
deleted file mode 100644
index f16ebe3a0..000000000
--- a/test/environment/shell-none.profile
+++ /dev/null
@@ -1 +0,0 @@
-shell none
diff --git a/test/profiles/ignore.exp b/test/profiles/ignore.exp
index 450d271c1..053d920d3 100755
--- a/test/profiles/ignore.exp
+++ b/test/profiles/ignore.exp
@@ -23,7 +23,7 @@ after 100
 send -- "exit\r"
 sleep 1
 
-send -- "firejail --ignore=seccomp --ignore=shell --profile=ignore.profile \r"
+send -- "firejail --ignore=seccomp --ignore=name --profile=ignore.profile \r"
 expect {
         timeout {puts "TESTING ERROR 3\n";exit}
         -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
@@ -39,7 +39,7 @@ after 100
 send -- "exit\r"
 sleep 1
 
-send -- "firejail --ignore=private --ignore=shell --profile=ignore.profile \r"
+send -- "firejail --ignore=private --ignore=name --profile=ignore.profile \r"
 expect {
         timeout {puts "TESTING ERROR 5\n";exit}
         -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
@@ -66,7 +66,7 @@ after 100
 send -- "exit\r"
 sleep 1
 
-send -- "firejail --ignore=quiet --ignore=shell --profile=ignore.profile \r"
+send -- "firejail --ignore=quiet --ignore=name --profile=ignore.profile \r"
 expect {
         timeout {puts "TESTING ERROR 9\n";exit}
         -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
diff --git a/test/profiles/ignore.profile b/test/profiles/ignore.profile
index aec231ad2..dec4a5db7 100644
--- a/test/profiles/ignore.profile
+++ b/test/profiles/ignore.profile
@@ -1,3 +1,3 @@
 private
 seccomp
-shell none
+name test
diff --git a/test/profiles/ignore2.profile b/test/profiles/ignore2.profile
index c85cd9544..9d7362599 100644
--- a/test/profiles/ignore2.profile
+++ b/test/profiles/ignore2.profile
@@ -1,5 +1,5 @@
 ignore seccomp
-ignore shell
+ignore name
 private
 seccomp
-shell none
+name test
diff --git a/test/profiles/ignore3.profile b/test/profiles/ignore3.profile
index f0c9699e1..4ad474851 100644
--- a/test/profiles/ignore3.profile
+++ b/test/profiles/ignore3.profile
@@ -1,4 +1,4 @@
 quiet
 private
 seccomp
-shell none
+name test
diff --git a/test/utils/build.exp b/test/utils/build.exp
index 3f42a74be..e1ea6af69 100755
--- a/test/utils/build.exp
+++ b/test/utils/build.exp
@@ -57,10 +57,6 @@ expect {
 }
 expect {
         timeout {puts "TESTING ERROR 11\n";exit}
-        "shell none"
-}
-expect {
-        timeout {puts "TESTING ERROR 11\n";exit}
         "private-bin cat,"
 }
 expect {