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

* configure.ac, debian/install, debian/postinst, debian/postrm,

Browse source 
etc/profile.d/Makefile.am, usr/share/byobu/profiles/Makefile.am,
  usr/share/byobu/profiles/Z97-byobu.sh.in => etc/profile.d/Z97-
  byobu.sh.in:
  - fix some recent regressions on byobu auto launching
This commit is contained in:
Dustin Kirkland 2015-11-14 16:57:11 -06:00
commit 10029df520
8 changed files with 28 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -19,7 +19,7 @@ AC_PROG_LN_S
AC_OUTPUT(Makefile \ AC_OUTPUT(Makefile \
etc/byobu/Makefile \ etc/byobu/Makefile \
etc/profile.d/Makefile \ etc/profile.d/Makefile \
usr/share/byobu/profiles/Z97-byobu.sh \ etc/profile.d/Z97-byobu.sh \
usr/share/applications/Makefile \ usr/share/applications/Makefile \
usr/bin/byobu \ usr/bin/byobu \
usr/bin/byobu-config \ usr/bin/byobu-config \

5
debian/changelog vendored
View file

@ -2,6 +2,11 @@ byobu (5.99) unreleased; urgency=medium
* usr/share/byobu/pixmaps/byobu.svg: * usr/share/byobu/pixmaps/byobu.svg:
- cleaned up vector image from Nobuto Murata - cleaned up vector image from Nobuto Murata
* configure.ac, debian/install, debian/postinst, debian/postrm,
etc/profile.d/Makefile.am, usr/share/byobu/profiles/Makefile.am,
usr/share/byobu/profiles/Z97-byobu.sh.in => etc/profile.d/Z97-
byobu.sh.in:
- fix some recent regressions on byobu auto launching
-- Dustin Kirkland <kirkland@ubuntu.com> Wed, 28 Oct 2015 09:48:49 +0900 -- Dustin Kirkland <kirkland@ubuntu.com> Wed, 28 Oct 2015 09:48:49 +0900

1
debian/install vendored
View file

@ -1,5 +1,6 @@
etc/byobu/socketdir etc/byobu/ etc/byobu/socketdir etc/byobu/
etc/byobu/backend etc/byobu/ etc/byobu/backend etc/byobu/
etc/profile.d/Z97-byobu.sh etc/profile.d/
usr/share/byobu/pixmaps/byobu.svg usr/share/icons/hicolor/scalable/apps/ usr/share/byobu/pixmaps/byobu.svg usr/share/icons/hicolor/scalable/apps/
usr/share/byobu/pixmaps/highcontrast/byobu.svg usr/share/icons/HighContrast/scalable/apps/ usr/share/byobu/pixmaps/highcontrast/byobu.svg usr/share/icons/HighContrast/scalable/apps/
debian/source_byobu.py usr/share/apport/package-hooks debian/source_byobu.py usr/share/apport/package-hooks

4
debian/postinst vendored
View file

@ -7,9 +7,9 @@ PKG="byobu"
db_get byobu/launch-by-default || true db_get byobu/launch-by-default || true
if [ "$RET" = true ]; then if [ "$RET" = true ]; then
ln -sf /usr/share/$PKG/profiles/Z97-$PKG.sh /etc/profile.d/Z97-$PKG.sh touch /etc/$PKG/autolaunch
else else
rm -f /etc/profile.d/Z97-$PKG.sh rm -f /etc/$PKG/autolaunch
fi fi
# Clean up any old-school screen-profiles diversions of /usr/bin/screen # Clean up any old-school screen-profiles diversions of /usr/bin/screen

4
debian/postrm vendored
View file

@ -2,10 +2,6 @@
PKG="byobu" PKG="byobu"
# If removing Byobu, ensure that we clean up this launch-by-default
# symlink, if it exists
rm -f /etc/profile.d/Z97-$PKG.sh
# Clean-up obsolete config file # Clean-up obsolete config file
rm -f /etc/byobu/statusrc || true rm -f /etc/byobu/statusrc || true

1
etc/profile.d/Makefile.am
View file

@ -1 +1,2 @@
etcdir = @sysconfdir@/profile.d etcdir = @sysconfdir@/profile.d
etc_DATA = Z97-byobu.sh

27
usr/share/byobu/profiles/Z97-byobu.sh.in → etc/profile.d/Z97-byobu.sh.in
View file

@ -19,16 +19,23 @@
# Apologies for borrowing the LC_BYOBU namespace, but: # Apologies for borrowing the LC_BYOBU namespace, but:
# a) it's reasonable to assume that no one else is using LC_BYOBU # a) it's reasonable to assume that no one else is using LC_BYOBU
# b) LC_* is sent and receieved by most /etc/ssh/ssh*_config # b) LC_* is sent and receieved by most /etc/ssh/ssh*_config
if [ -n "$LC_BYOBU" ] && [ "$LC_BYOBU" -gt 0 ] && [ -r "@prefix@/bin/byobu-launch" ]; then
. @prefix@/bin/byobu-launch if [ -r "@prefix@/bin/byobu-launch" ]; then
elif [ "$LC_TERMTYPE" = "byobu" ] && [ -r "@prefix@/bin/byobu-launch" ]; then if [ "$LC_BYOBU" = "0" ]; then
. @prefix@/bin/byobu-launch true
elif [ "$LC_TERMTYPE" = "byobu-screen" ] && [ -r "@prefix@/bin/byobu-launch" ]; then elif [ "$LC_BYOBU" = "1" ]; then
export BYOBU_BACKEND="screen" . @prefix@/bin/byobu-launch
. @prefix@/bin/byobu-launch elif [ -e "/etc/byobu/autolaunch" ]; then
elif [ "$LC_TERMTYPE" = "byobu-tmux" ] && [ -r "@prefix@/bin/byobu-launch" ]; then . @prefix@/bin/byobu-launch
export BYOBU_BACKEND="tmux" elif [ "$LC_TERMTYPE" = "byobu" ]; then
. @prefix@/bin/byobu-launch . @prefix@/bin/byobu-launch
elif [ "$LC_TERMTYPE" = "byobu-screen" ]; then
export BYOBU_BACKEND="screen"
. @prefix@/bin/byobu-launch
elif [ "$LC_TERMTYPE" = "byobu-tmux" ]; then
export BYOBU_BACKEND="tmux"
. @prefix@/bin/byobu-launch
fi
fi fi
# vi: syntax=sh ts=4 noexpandtab # vi: syntax=sh ts=4 noexpandtab

2
usr/share/byobu/profiles/Makefile.am
View file

@ -1,2 +1,2 @@
profilesdir = $(datadir)/@PACKAGE@/profiles profilesdir = $(datadir)/@PACKAGE@/profiles
profiles_DATA = bashrc byoburc dircolors screenrc common tmux tmuxrc NONE Z97-byobu.sh profiles_DATA = bashrc byoburc dircolors screenrc common tmux tmuxrc NONE