Quote the variables in i3-sensible-* correctly

[i3/i3] / i3-sensible-terminal

diff --git a/i3-sensible-terminal b/i3-sensible-terminal
index e5bf2718be1c3afa8623f6d3b577a6373bffad7b..bb66f02b55908fb423c0c214bcdac2b4360c8fbe 100755 (executable)
--- a/i3-sensible-terminal
+++ b/i3-sensible-terminal
@@ -1,15 +1,17 @@
 #!/bin/sh
+#
+# This code is released in public domain by Han Boetes <han@mijncomputer.nl>
+#
 # This script tries to exec a terminal emulator by trying some known terminal
 # emulators.
 #
-# Distributions/packagers should enhance this script with a
-# 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:
-[ -n "$TERMINAL" ] && which $TERMINAL >/dev/null && exec $TERMINAL "$@"
+# We welcome patches that add distribution-specific mechanisms to find the
+# preferred terminal emulator. On Debian, there is the x-terminal-emulator
+# symlink for example.
+for terminal in "$TERMINAL" x-terminal-emulator urxvt rxvt terminator Eterm aterm xterm gnome-terminal roxterm xfce4-terminal termite lxterminal mate-terminal terminology; do
+    if command -v "$terminal" > /dev/null 2>&1; then
+        exec "$terminal" "$@"
+    fi
+done
 
-# Hopefully one of these is installed:
-which xterm >/dev/null && exec xterm "$@"
-which urxvt >/dev/null && exec urxvt "$@"
-which rxvt >/dev/null && exec rxvt "$@"
-which roxterm >/dev/null && exec roxterm "$@"
+i3-nagbar -m 'i3-sensible-terminal could not find a terminal emulator. Please install one.'