From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 19 Nov 2011 14:08:18 +0000 (+0000)
Subject: i3-sensible-terminal: check $TERMINAL to not call 'which' without parameters (Thanks... 
X-Git-Tag: 4.2~241
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=0ffcc00b1515fd109dbb95a750d7ada68679b04b;hp=b6e859787e2f4c392c8fa92e4458b5d784570640;p=i3%2Fi3

i3-sensible-terminal: check $TERMINAL to not call 'which' without parameters (Thanks Fandekasp)
---

diff --git a/debian/patches/use-x-terminal-emulator.patch b/debian/patches/use-x-terminal-emulator.patch
index fd515c16..28e9200d 100644
--- a/debian/patches/use-x-terminal-emulator.patch
+++ b/debian/patches/use-x-terminal-emulator.patch
@@ -11,7 +11,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 "$@"
  
 +# Debian-specific: use x-terminal-emulator
 +which x-terminal-emulator >/dev/null && exec x-terminal-emulator "$@"
diff --git a/i3-sensible-terminal b/i3-sensible-terminal
index 28e60623..e5bf2718 100755
--- 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 "$@"