From 8881112aada2776ef2064130aae862975244ed0d Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Tue, 16 Jul 2013 16:59:30 -0500 Subject: [PATCH] * usr/lib/byobu/include/common: LP: #1180427 - handle zsh's interpretation of "command -v", let it fall through to use 'type' for BYOBU_TEST --- debian/changelog | 3 +++ usr/lib/byobu/include/common | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 20af97ef..726b56cc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,9 @@ byobu (5.46) unreleased; urgency=low [ Dustin Kirkland ] * usr/share/byobu/keybindings/f-keys.tmux: LP: #1190290 - handle spaces in windows and layouts properly + * usr/lib/byobu/include/common: LP: #1180427 + - handle zsh's interpretation of "command -v", let it fall through + to use 'type' for BYOBU_TEST -- Dustin Kirkland Mon, 15 Jul 2013 15:52:56 -0500 diff --git a/usr/lib/byobu/include/common b/usr/lib/byobu/include/common index 08352195..6bff53a0 100755 --- a/usr/lib/byobu/include/common +++ b/usr/lib/byobu/include/common @@ -24,7 +24,7 @@ if [ -z "${BYOBU_INCLUDED_LIBS}" ]; then # Find command/type/which for BYOBU_TEST in "command -v" "type" "which"; do - $BYOBU_TEST >/dev/null && break + $BYOBU_TEST >/dev/null && break || true done # If the backend is already set (eg. running `byobu-tmux`), do nothing.