* usr/bin/byobu-launch, usr/bin/byobu-launcher:

- fix situation where the profile might exit 0,
    and prevent a user from logging in
This commit is contained in:
Dustin Kirkland 2011-04-17 13:27:11 -05:00
commit 893033cf07
3 changed files with 17 additions and 12 deletions

4
debian/changelog vendored
View file

@ -1,6 +1,8 @@
byobu (3.32) unreleased; urgency=low
* UNRELEASED
* usr/bin/byobu-launch, usr/bin/byobu-launcher:
- fix situation where the profile might exit 0,
and prevent a user from logging in
-- Dustin Kirkland <kirkland@ubuntu.com> Fri, 15 Apr 2011 13:40:31 -0500

View file

@ -21,9 +21,7 @@ PKG="byobu"
DATA="$HOME/.$PKG"
case "$-" in
*i*)
byobu-launcher
;;
esac
if byobu-launcher; then
# Wait very briefly for the no-logout flag to get written?
sleep 0.1
if [ -e "$DATA/no-logout-on-detach" ] || [ -e "/var/run/screen/S-$USER/byobu.no-logout" ]; then
@ -33,3 +31,6 @@ if [ -e "$DATA/no-logout-on-detach" ] || [ -e "/var/run/screen/S-$USER/byobu.no-
else
exit 0
fi
fi
;;
esac

View file

@ -22,7 +22,9 @@ DATA="$HOME/.$PKG"
[ -z "$BYOBU_PREFIX" ] && export BYOBU_PREFIX="/usr"
export BYOBU_PREFIX
if [ ! -e "$DATA/disable-autolaunch" ]; then
if [ -e "$DATA/disable-autolaunch" ]; then
false
else
case "$TERM" in
*screen*)
# Handle nesting