4 files changed, 3 insertions, 59 deletions

diff --git a/src/firejail/main.c b/src/firejail/main.c
index 695f018a5..1554209b9 100644
--- a/src/firejail/main.c
+++ b/src/firejail/main.c
@@ -2816,11 +2816,9 @@ int main(int argc, char **argv, char **envp) {
 
         // prog_index could still be -1 if no program was specified
         if (prog_index == -1 && arg_shell_none) {
-just_run_the_shell = 1;
-if (!cfg.shell)
-        cfg.shell = cfg.usershell;
-//              fprintf(stderr, "Error: shell=none configured, but no program specified\n");
-//              exit(1);
+                just_run_the_shell = 1;
+                if (!cfg.shell)
+                        cfg.shell = cfg.usershell;
         }
 
         // check trace configuration
diff --git a/test/environment/environment.sh b/test/environment/environment.sh
index 2b77973ac..9e58fdf95 100755
--- a/test/environment/environment.sh
+++ b/test/environment/environment.sh
@@ -36,9 +36,6 @@ echo "TESTING: extract command (extract_command.exp)"
 echo "TESTING: environment variables (test/environment/env.exp)"
 ./env.exp
 
-echo "TESTING: shell none(test/environment/shell-none.exp)"
-./shell-none.exp
-
 which dash 2>/dev/null
 if [ "$?" -eq 0 ];
 then
diff --git a/test/environment/shell-none.exp b/test/environment/shell-none.exp
deleted file mode 100755
index 512e2efc2..000000000
--- a/test/environment/shell-none.exp
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/bin/expect -f
-# This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
-# License GPL v2
-
-set timeout 10
-spawn $env(SHELL)
-match_max 100000
-
-send -- "firejail  --shell=none\r"
-expect {
-        timeout {puts "TESTING ERROR 0\n";exit}
-        "shell=none configured, but no program specified"
-}
-sleep 1
-
-send -- "firejail  --profile=shell-none.profile\r"
-expect {
-        timeout {puts "TESTING ERROR 1\n";exit}
-        "shell=none configured, but no program specified"
-}
-after 100
-
-send -- "firejail  --shell=none ls\r"
-expect {
-        timeout {puts "TESTING ERROR 2\n";exit}
-        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
-}
-expect {
-        timeout {puts "TESTING ERROR 3\n";exit}
-        "environment.sh"
-}
-after 100
-
-send -- "firejail  --profile=shell-none.profile ls\r"
-expect {
-        timeout {puts "TESTING ERROR 4\n";exit}
-        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
-}
-expect {
-        timeout {puts "TESTING ERROR 5\n";exit}
-        "environment.sh"
-}
-after 100
-
-
-puts "\nall done\n"
diff --git a/test/profiles/profile_appname.exp b/test/profiles/profile_appname.exp
index fce278b4c..c178e8e00 100755
--- a/test/profiles/profile_appname.exp
+++ b/test/profiles/profile_appname.exp
@@ -16,10 +16,6 @@ expect {
         timeout {puts "TESTING ERROR 1\n";exit}
         "Reading profile /etc/firejail/firefox-common.profile"
 }
-expect {
-        timeout {puts "TESTING ERROR 2\n";exit}
-        "shell=none configured, but no program specified"
-}
 
 after 100
 puts "\nall done\n"