Merge pull request #761 from reinerh/master

minor fixes

3 files changed, 4 insertions, 3 deletions

diff --git a/src/firejail/env.c b/src/firejail/env.c
index 2cc65e464..88cd6918d 100644
--- a/src/firejail/env.c
+++ b/src/firejail/env.c
@@ -135,7 +135,8 @@ void env_defaults(void) {
         }
 
         // set the window title
-        printf("\033]0;firejail %s\007", cfg.window_title);
+        if (!arg_quiet)
+                printf("\033]0;firejail %s\007", cfg.window_title);
         fflush(0);
 }
 
diff --git a/test/environment/environment.sh b/test/environment/environment.sh
index 785f57d3f..04a1daaf6 100755
--- a/test/environment/environment.sh
+++ b/test/environment/environment.sh
@@ -50,7 +50,7 @@ which zsh
 if [ "$?" -eq 0 ];
 then
         echo "TESTING: zsh (test/environment/zsh.exp)"
-        ./csh.exp
+        ./zsh.exp
 else
         echo "TESTING SKIP: zsh not found"
 fi
diff --git a/test/environment/zsh.exp b/test/environment/zsh.exp
index 5fca1cf22..578951ce0 100755
--- a/test/environment/zsh.exp
+++ b/test/environment/zsh.exp
@@ -27,7 +27,7 @@ expect {
 }
 expect {
         timeout {puts "TESTING ERROR 2.1\n";exit}
-        "/usr/bin/zsh"
+        "/bin/zsh"
 }
 send -- "exit\r"
 after 100