Merge branch 'master' into next

[i3/i3] / i3-sensible-terminal

diff --git a/i3-sensible-terminal b/i3-sensible-terminal
index 28e60623a2f29f2d4db5c40ae0cb728463cf56e1..e5bf2718be1c3afa8623f6d3b577a6373bffad7b 100755 (executable)
--- a/i3-sensible-terminal
+++ b/i3-sensible-terminal
@@ -6,7 +6,7 @@
 # distribution-specific mechanism to find the preferred terminal emulator. On
 # Debian, there is the x-terminal-emulator symlink for example.
 # Please don't touch the first line, though:
-which $TERMINAL >/dev/null && exec $TERMINAL "$@"
+[ -n "$TERMINAL" ] && which $TERMINAL >/dev/null && exec $TERMINAL "$@"
 
 # Hopefully one of these is installed:
 which xterm >/dev/null && exec xterm "$@"