From: Michael Stapelberg <michael@stapelberg.de>
Date: Fri, 15 Feb 2013 15:41:28 +0000 (+0100)
Subject: tests: unset $ENV{SHELL} to avoid breakage with fish (Thanks dRbiG)
X-Git-Tag: 4.5~17
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=7f0065e1b15cd03efd22be227ad0129f872599c5;p=i3%2Fi3

tests: unset $ENV{SHELL} to avoid breakage with fish (Thanks dRbiG)
---

diff --git a/testcases/lib/SocketActivation.pm b/testcases/lib/SocketActivation.pm
index ea6ae97d..228caaa6 100644
--- a/testcases/lib/SocketActivation.pm
+++ b/testcases/lib/SocketActivation.pm
@@ -53,6 +53,10 @@ sub activate_i3 {
         $ENV{LISTEN_FDS} = 1;
         delete $ENV{DESKTOP_STARTUP_ID};
         delete $ENV{I3SOCK};
+        # $SHELL could be set to fish, which will horribly break running shell
+        # commands via i3’s exec feature. This happened e.g. when having
+        # “set-option -g default-shell "/usr/bin/fish"” in ~/.tmux.conf
+        delete $ENV{SHELL};
         unless ($args{dont_create_temp_dir}) {
             $ENV{XDG_RUNTIME_DIR} = '/tmp/i3-testsuite/';
             mkdir $ENV{XDG_RUNTIME_DIR};