deprecating --shell (3) (#5196)

2 files changed, 5 insertions, 5 deletions

diff --git a/src/firejail/sandbox.c b/src/firejail/sandbox.c
index 5b9606fbd..e8c4a445a 100644
--- a/src/firejail/sandbox.c
+++ b/src/firejail/sandbox.c
@@ -528,7 +528,7 @@ void start_application(int no_sandbox, int fd, char *set_sandbox_status) {
         //****************************************
         // start the program without using a shell
         //****************************************
-        else if (!arg_appimage) {
+        else if (!arg_appimage && !arg_doubledash) {
                 if (arg_debug) {
                         int i;
                         for (i = cfg.original_program_index; i < cfg.original_argc; i++) {
@@ -560,9 +560,9 @@ void start_application(int no_sandbox, int fd, char *set_sandbox_status) {
                 execvp(cfg.original_argv[cfg.original_program_index], &cfg.original_argv[cfg.original_program_index]);
         }
         //****************************************
-        // start the program using a shell (appimages)
+        // start the program using a shell
         //****************************************
-        else { // appimage
+        else { // appimage or double-dash
                 char *arg[5];
                 int index = 0;
                 assert(cfg.usershell);
diff --git a/test/filters/noroot.exp b/test/filters/noroot.exp
index 66e1e4e27..942aedbcb 100755
--- a/test/filters/noroot.exp
+++ b/test/filters/noroot.exp
@@ -81,11 +81,11 @@ spawn $env(SHELL)
 send -- "firejail --debug --join=test\r"
 expect {
         timeout {puts "TESTING ERROR 13\n";exit}
-        "User namespace detected"
+        "Joining user namespace"
 }
 expect {
         timeout {puts "TESTING ERROR 14\n";exit}
-        "Joining user namespace"
+        "Child process initialized"
 }
 sleep 1