diff options
author | 2016-09-03 09:46:20 -0400 | |
---|---|---|
committer | 2016-09-03 09:46:20 -0400 | |
commit | 7f3717d58f4dd346a56a047d0443e5adfe815cbb (patch) | |
tree | c9008459e7590c0b71bf9a46a30071e1ced1c4ef | |
parent | Merge pull request #757 from Fred-Barclay/dosbox_fix (diff) | |
parent | Fix path to zsh (diff) | |
download | firejail-7f3717d58f4dd346a56a047d0443e5adfe815cbb.tar.gz firejail-7f3717d58f4dd346a56a047d0443e5adfe815cbb.tar.zst firejail-7f3717d58f4dd346a56a047d0443e5adfe815cbb.zip |
Merge pull request #761 from reinerh/master
minor fixes
-rw-r--r-- | src/firejail/env.c | 3 | ||||
-rwxr-xr-x | test/environment/environment.sh | 2 | ||||
-rwxr-xr-x | test/environment/zsh.exp | 2 |
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) { | |||
135 | } | 135 | } |
136 | 136 | ||
137 | // set the window title | 137 | // set the window title |
138 | printf("\033]0;firejail %s\007", cfg.window_title); | 138 | if (!arg_quiet) |
139 | printf("\033]0;firejail %s\007", cfg.window_title); | ||
139 | fflush(0); | 140 | fflush(0); |
140 | } | 141 | } |
141 | 142 | ||
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 | |||
50 | if [ "$?" -eq 0 ]; | 50 | if [ "$?" -eq 0 ]; |
51 | then | 51 | then |
52 | echo "TESTING: zsh (test/environment/zsh.exp)" | 52 | echo "TESTING: zsh (test/environment/zsh.exp)" |
53 | ./csh.exp | 53 | ./zsh.exp |
54 | else | 54 | else |
55 | echo "TESTING SKIP: zsh not found" | 55 | echo "TESTING SKIP: zsh not found" |
56 | fi | 56 | 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 { | |||
27 | } | 27 | } |
28 | expect { | 28 | expect { |
29 | timeout {puts "TESTING ERROR 2.1\n";exit} | 29 | timeout {puts "TESTING ERROR 2.1\n";exit} |
30 | "/usr/bin/zsh" | 30 | "/bin/zsh" |
31 | } | 31 | } |
32 | send -- "exit\r" | 32 | send -- "exit\r" |
33 | after 100 | 33 | after 100 |