github/byobu
1
0
Fork 0
mirror of https://github.com/dustinkirkland/byobu synced 2025-08-22 14:24:39 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

* byobu, byobu-launcher, byobu-select-profile: check $STY rather than

Browse source 
$TERM, to determine if we're already inside of a screen session, per
    screen's manpage; wrap $STY in double quotes; use -n rather than -z
  [ Chow Loong Jin and Dustin Kirkland ]

Signed-off-by: Dustin Kirkland <kirkland@canonical.com>
This commit is contained in:
Dustin Kirkland 2009-07-24 08:28:30 -05:00
commit 951a40a53e
4 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
byobu
View file

@ -28,7 +28,7 @@ if [ "$1" = "-v" ]; then
fi fi
# Nesting byobu inside of screen doesn't work well # Nesting byobu inside of screen doesn't work well
if [ ! -z $STY ]; then if [ -n "$STY" ]; then
echo `gettext "Exit the current screen session to run $PKG"` echo `gettext "Exit the current screen session to run $PKG"`
exit 1 exit 1
fi fi

2
byobu-launcher
View file

@ -18,7 +18,7 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
[ -z $STY ] || exit 0 [ -z "$STY" ] || exit 0
out=`screen -ls 2>/dev/null` || true out=`screen -ls 2>/dev/null` || true
if echo "$out" | grep -qsi "^No Sockets found in "; then if echo "$out" | grep -qsi "^No Sockets found in "; then

2
byobu-select-profile
View file

@ -130,7 +130,7 @@ setprofile() {
ln -s "$PROFILE_DIR/$x" "$HOME/.$PKG/profile" ln -s "$PROFILE_DIR/$x" "$HOME/.$PKG/profile"
found=1 found=1
echo echo
if [ ! -z $STY ]; then if [ -n "$STY" ]; then
echo `gettext 'If you are using the default set of keybindings, press\n<F5> to activate these changes.\n\nOtherwise, exit this screen session and start a new one.'` echo `gettext 'If you are using the default set of keybindings, press\n<F5> to activate these changes.\n\nOtherwise, exit this screen session and start a new one.'`
else else
echo `gettext 'Run "byobu" to activate'` echo `gettext 'Run "byobu" to activate'`

8
debian/changelog vendored
View file

@ -1,8 +1,12 @@
byobu (2.24) unreleased; urgency=low byobu (2.24) unreleased; urgency=low
* UNRELEASED [ Chow Loong Jin and Dustin Kirkland ]
* byobu, byobu-launcher, byobu-select-profile: check $STY rather than
$TERM, to determine if we're already inside of a screen session, per
screen's manpage; wrap $STY in double quotes; use -n rather than -z
-- Dustin Kirkland <kirkland@ubuntu.com> Wed, 22 Jul 2009 21:37:46 -0500
-- Dustin Kirkland <kirkland@ubuntu.com> Fri, 24 Jul 2009 08:27:24 -0500
byobu (2.23-0ubuntu1) karmic; urgency=low byobu (2.23-0ubuntu1) karmic; urgency=low