bash command fix

2 files changed, 15 insertions, 9 deletions

diff --git a/src/firejail/main.c b/src/firejail/main.c
index a6e95e963..0e0d685c4 100644
--- a/src/firejail/main.c
+++ b/src/firejail/main.c
@@ -1214,7 +1214,13 @@ int main(int argc, char **argv) {
                         errExit("malloc");
                 char *ptr = cfg.command_line;
                 for (i = 0; i < argcnt; i++) {
-                        sprintf(ptr, "\"%s\" ", argv[i + prog_index]);
+                        // detect bash commands
+                        if (strstr(argv[i + prog_index], "&&") || strstr(argv[i + prog_index], "||")) {
+                                sprintf(ptr, "%s ", argv[i + prog_index]);
+                        }
+                        else {
+                                sprintf(ptr, "\"%s\" ", argv[i + prog_index]);
+                        }
                         ptr += strlen(ptr);
                 }
         }
diff --git a/test/test.sh b/test/test.sh
index aaae2a981..74e928473 100755
--- a/test/test.sh
+++ b/test/test.sh
@@ -287,14 +287,14 @@ else
         echo "TESTING: weechat not found"
 fi
 
-#which wine
-#if [ "$?" -eq 0 ];
-#then
-#       echo "TESTING: wine"
-#       ./wine.exp
-#else
-#       echo "TESTING: wine not found"
-#fi
+which wine
+if [ "$?" -eq 0 ];
+then
+        echo "TESTING: wine"
+        ./wine.exp
+else
+        echo "TESTING: wine not found"
+fi