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

* byobu, debian/postrm, debian/preinst, debian/rules, screen-launcher:

Browse source 
remove the dpkg diversion on /usr/bin/screen as this has proven
    to be controversial; users will need to call "byobu" to launch
    a byobu-style screen session


Signed-off-by: Dustin Kirkland <kirkland@canonical.com>
This commit is contained in:
Dustin Kirkland 2009-05-26 16:48:59 +02:00
commit 4c8f23e182
6 changed files with 13 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

12
byobu
View file

@ -19,17 +19,7 @@
OLDPKG="screen-profiles" OLDPKG="screen-profiles"
PKG="byobu" PKG="byobu"
SCREEN_REAL="/usr/bin/screen"
# Support Debian/Ubuntu's diversion for /usr/bin/screen, but also
# Red Hat and others who do not divert
if [ -x "/usr/bin/screen.real" ]; then
SCREEN_REAL="/usr/bin/screen.real"
elif [ -x "/usr/bin/screen" -a "$0" != "/usr/bin/screen" ]; then
SCREEN_REAL="/usr/bin/screen"
else
echo "ERROR: Cannot determine your actual screen binary" 1>&2
exit 1
fi
# Upgrade old config dir to the new name # Upgrade old config dir to the new name
[ -d "$HOME/.$OLDKPG" -a ! -e "$HOME/.$PKG" ] && mv -f "$HOME/.$OLDPKG" "$HOME/.$PKG" [ -d "$HOME/.$OLDKPG" -a ! -e "$HOME/.$PKG" ] && mv -f "$HOME/.$OLDPKG" "$HOME/.$PKG"

7
debian/changelog vendored
View file

@ -1,8 +1,11 @@
byobu (2.6) unreleased; urgency=low byobu (2.6) unreleased; urgency=low
* UNRELEASED * byobu, debian/postrm, debian/preinst, debian/rules, screen-launcher:
remove the dpkg diversion on /usr/bin/screen as this has proven
to be controversial; users will need to call "byobu" to launch
a byobu-style screen session
-- Dustin Kirkland <kirkland@ubuntu.com> Tue, 26 May 2009 12:00:27 +0200 -- Dustin Kirkland <kirkland@ubuntu.com> Tue, 26 May 2009 16:47:40 +0200
byobu (2.5-0ubuntu1) karmic; urgency=low byobu (2.5-0ubuntu1) karmic; urgency=low

2
debian/postrm vendored
View file

@ -2,7 +2,7 @@
PKG="byobu" PKG="byobu"
if [ "$1" = "remove" ]; then if [ -x "/usr/bin/screen.real" ]; then
dpkg-divert --package "$PKG" --rename --remove /usr/bin/screen dpkg-divert --package "$PKG" --rename --remove /usr/bin/screen
fi fi

6
debian/preinst vendored
View file

@ -2,8 +2,10 @@
PKG="byobu" PKG="byobu"
if [ "$1" = install -o "$1" = upgrade ]; then if [ -x "/usr/bin/screen.real" ]; then
dpkg-divert --package "$PKG" --divert /usr/bin/screen.real --rename /usr/bin/screen # Byobu used to divert the real /usr/bin/screen, but we don't
# do this anymore; clean up old diversion if upgrading
dpkg-divert --package "$PKG" --rename --remove /usr/bin/screen
fi fi
#DEBHELPER# #DEBHELPER#

1
debian/rules vendored
View file

@ -48,7 +48,6 @@ install: build install-po
dh_testdir dh_testdir
dh_testroot dh_testroot
dh_clean -k dh_clean -k
dh_link usr/bin/byobu usr/bin/screen
dh_link usr/bin/byobu-status usr/bin/screen-profiles-status dh_link usr/bin/byobu-status usr/bin/screen-profiles-status
dh_install -X.bzr dh_install -X.bzr

4
screen-launcher
View file

@ -27,8 +27,8 @@
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
# Start new session # Start new byobu session
exec screen exec byobu
else else
# Re-attach to an existing session # Re-attach to an existing session
exec screen -xRR exec screen -xRR