github/byobu
1
0
Fork 0
mirror of https://github.com/dustinkirkland/byobu synced 2025-08-21 14:03:18 -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, etc/profile.d/Z97-byobu.sh.in =>
  usr/share/byobu/profiles/Z97-byobu.sh.in, usr/bin/byobu.in,
  usr/bin/byobu-launcher-install.in,
  usr/lib/byobu/include/config.py.in,
  usr/share/byobu/profiles/Makefile.am:
  - fix some discrepancies between Z97- and Z98-
  at Z97-* to ensure that it's sourced last-ish; clean up and check
This commit is contained in:
Dustin Kirkland 2015-08-31 12:32:07 -05:00
commit 76cf1242ad
11 changed files with 16 additions and 12 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 \
etc/profile.d/Z97-byobu.sh usr/share/byobu/profiles/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 \

10
debian/changelog vendored
View file

@ -1,6 +1,12 @@
byobu (5.96) unreleased; urgency=medium byobu (5.96) unreleased; urgency=medium
* UNRELEASED * configure.ac, debian/install, debian/postinst, debian/postrm,
etc/profile.d/Makefile.am, etc/profile.d/Z97-byobu.sh.in =>
usr/share/byobu/profiles/Z97-byobu.sh.in, usr/bin/byobu.in,
usr/bin/byobu-launcher-install.in,
usr/lib/byobu/include/config.py.in,
usr/share/byobu/profiles/Makefile.am:
- fix some discrepancies between Z97- and Z98-
-- Dustin Kirkland <kirkland@ubuntu.com> Mon, 31 Aug 2015 12:03:35 -0500 -- Dustin Kirkland <kirkland@ubuntu.com> Mon, 31 Aug 2015 12:03:35 -0500
@ -4155,7 +4161,7 @@ byobu (2.57-0ubuntu1) lucid; urgency=low
* debian/postinst, usr/bin/byobu-config, usr/bin/byobu-launcher, * debian/postinst, usr/bin/byobu-config, usr/bin/byobu-launcher,
usr/bin/byobu-launcher-uninstall: install the profile.d script usr/bin/byobu-launcher-uninstall: install the profile.d script
at Z98-* to ensure that it's sourced last-ish; clean up and check at Z97-* to ensure that it's sourced last-ish; clean up and check
for the new location; check if shell is interactive before exec'ing for the new location; check if shell is interactive before exec'ing
in the launcher in the launcher
* byobu-config: correct logic in determining if byobu is set to auto * byobu-config: correct logic in determining if byobu is set to auto

1
debian/install vendored
View file

@ -1,6 +1,5 @@
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/bin/$PKG-launch /etc/profile.d/Z98-$PKG.sh ln -sf /usr/share/$PKG/profiles/Z97-$PKG.sh /etc/profile.d/Z97-$PKG.sh
else else
rm -f /etc/profile.d/Z98-$PKG.sh rm -f /etc/profile.d/Z97-$PKG.sh
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

2
debian/postrm vendored
View file

@ -4,7 +4,7 @@ PKG="byobu"
# If removing Byobu, ensure that we clean up this launch-by-default # If removing Byobu, ensure that we clean up this launch-by-default
# symlink, if it exists # symlink, if it exists
rm -f /etc/profile.d/Z98-$PKG.sh 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,2 +1 @@
etcdir = @sysconfdir@/profile.d etcdir = @sysconfdir@/profile.d
etc_DATA = Z97-byobu.sh

2
usr/bin/byobu-launcher-install.in
View file

@ -56,7 +56,7 @@ install_launcher_fish() {
$PKG-launcher-uninstall || true $PKG-launcher-uninstall || true
# Handle bourne shells, if not set globally in /etc/profile.d # Handle bourne shells, if not set globally in /etc/profile.d
if [ ! -h "/etc/profile.d/Z98-$PKG.sh" ]; then if [ ! -h "/etc/profile.d/Z97-$PKG.sh" ]; then
# Install in $HOME/.profile unconditionally # Install in $HOME/.profile unconditionally
install_launcher "$HOME/.profile" install_launcher "$HOME/.profile"
# Now, install in any shell-specific profiles, if they exist # Now, install in any shell-specific profiles, if they exist

2
usr/bin/byobu.in
View file

@ -89,7 +89,7 @@ if [ "$#" = "1" ]; then
fi fi
# Check if we're being autolaunched, and this user explicitly does not want it. # Check if we're being autolaunched, and this user explicitly does not want it.
if [ "$0" = "/etc/profile.d/Z98-$PKG.sh" ] && [ -r "$BYOBU_CONFIG_DIR/disable-autolaunch" ]; then if [ "$0" = "/etc/profile.d/Z97-$PKG.sh" ] && [ -r "$BYOBU_CONFIG_DIR/disable-autolaunch" ]; then
exit 0 exit 0
fi fi

2
usr/lib/byobu/include/config.py.in
View file

@ -362,7 +362,7 @@ def autolaunch():
return 1 return 1
except: except:
return 0 return 0
if os.path.exists("/etc/profile.d/Z98-%s.sh" % PKG): if os.path.exists("/etc/profile.d/Z97-%s.sh" % PKG):
return 1 return 1
return 0 return 0

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 profiles_DATA = bashrc byoburc dircolors screenrc common tmux tmuxrc NONE Z97-byobu.sh

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