From 3f60f2527cb5947813c2ab84471772713f28dc5e Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Sat, 20 Jan 2024 20:50:42 -0600 Subject: [PATCH] if we're in a busybox/ash shell, but real bash is available, use bash + + --- debian/changelog | 7 +++++++ usr/bin/byobu.in | 11 +++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 792e0528..ccb43187 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +byobu (6.7) unreleased; urgency=medium + + * usr/bin/byobu.in: + - if we're in a busybox/ash shell, but real bash is available, use bash + + -- Dustin Kirkland Sat, 20 Jan 2024 20:49:21 -0600 + byobu (6.6) released; urgency=medium * usr/share/byobu/profiles/bashrc: diff --git a/usr/bin/byobu.in b/usr/bin/byobu.in index b3616a4e..870191f0 100755 --- a/usr/bin/byobu.in +++ b/usr/bin/byobu.in @@ -2,7 +2,7 @@ # # byobu - wrapper script # Copyright (C) 2008-2009 Canonical Ltd. -# Copyright (C) 2008-2014 Dustin Kirkland +# Copyright (C) 2008-2024 Dustin Kirkland # # Authors: Dustin Kirkland # @@ -18,7 +18,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -VERSION=5.134 +VERSION=6.7 PKG="byobu" # All sorts of things go wrong if you don't own your $HOME dir. @@ -32,6 +32,13 @@ if [ ! -O "$HOME" ]; then exit 1 fi +# If we're in a busybox/ash shell (or shell is undefined), +# and a full bash shell is available, then please let's use bash in byobu. +# Other shells are supported, but your mileage may vary... +if [ "$SHELL" = "/bin/ash" ] || [ "$SHELL" = "ash" ] || [ -z "$SHELL" ]; then + [ -x "/bin/bash" ] && export SHELL="/bin/bash" +fi + # Source local byobu config if [ -r "$HOME/.byoburc" ]; then # Ensure that this configuration is usable