From 76cf1242ad17b59b8152b76b0b82e359ea712988 Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Mon, 31 Aug 2015 12:32:07 -0500 Subject: [PATCH] * 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- at Z97-* to ensure that it's sourced last-ish; clean up and check --- configure.ac | 2 +- debian/changelog | 10 ++++++++-- debian/install | 1 - debian/postinst | 4 ++-- debian/postrm | 2 +- etc/profile.d/Makefile.am | 1 - usr/bin/byobu-launcher-install.in | 2 +- usr/bin/byobu.in | 2 +- usr/lib/byobu/include/config.py.in | 2 +- usr/share/byobu/profiles/Makefile.am | 2 +- .../share/byobu/profiles}/Z97-byobu.sh.in | 0 11 files changed, 16 insertions(+), 12 deletions(-) rename {etc/profile.d => usr/share/byobu/profiles}/Z97-byobu.sh.in (100%) diff --git a/configure.ac b/configure.ac index 9e081973..d4a3db65 100644 --- a/configure.ac +++ b/configure.ac @@ -19,7 +19,7 @@ AC_PROG_LN_S AC_OUTPUT(Makefile \ etc/byobu/Makefile \ etc/profile.d/Makefile \ - etc/profile.d/Z97-byobu.sh + usr/share/byobu/profiles/Z97-byobu.sh \ usr/share/applications/Makefile \ usr/bin/byobu \ usr/bin/byobu-config \ diff --git a/debian/changelog b/debian/changelog index 8dba4ebf..4e381e44 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,12 @@ 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 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, 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 in the launcher * byobu-config: correct logic in determining if byobu is set to auto diff --git a/debian/install b/debian/install index e5223958..0d85cab8 100644 --- a/debian/install +++ b/debian/install @@ -1,6 +1,5 @@ etc/byobu/socketdir 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/highcontrast/byobu.svg usr/share/icons/HighContrast/scalable/apps/ debian/source_byobu.py usr/share/apport/package-hooks diff --git a/debian/postinst b/debian/postinst index 85a7605e..6f166a92 100644 --- a/debian/postinst +++ b/debian/postinst @@ -7,9 +7,9 @@ PKG="byobu" db_get byobu/launch-by-default || true 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 - rm -f /etc/profile.d/Z98-$PKG.sh + rm -f /etc/profile.d/Z97-$PKG.sh fi # Clean up any old-school screen-profiles diversions of /usr/bin/screen diff --git a/debian/postrm b/debian/postrm index d3d997a4..5b7afe4d 100644 --- a/debian/postrm +++ b/debian/postrm @@ -4,7 +4,7 @@ PKG="byobu" # If removing Byobu, ensure that we clean up this launch-by-default # 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 rm -f /etc/byobu/statusrc || true diff --git a/etc/profile.d/Makefile.am b/etc/profile.d/Makefile.am index b0d07037..d1e06f4a 100644 --- a/etc/profile.d/Makefile.am +++ b/etc/profile.d/Makefile.am @@ -1,2 +1 @@ etcdir = @sysconfdir@/profile.d -etc_DATA = Z97-byobu.sh diff --git a/usr/bin/byobu-launcher-install.in b/usr/bin/byobu-launcher-install.in index c8522a9c..1e49d0ad 100755 --- a/usr/bin/byobu-launcher-install.in +++ b/usr/bin/byobu-launcher-install.in @@ -56,7 +56,7 @@ install_launcher_fish() { $PKG-launcher-uninstall || true # 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_launcher "$HOME/.profile" # Now, install in any shell-specific profiles, if they exist diff --git a/usr/bin/byobu.in b/usr/bin/byobu.in index 6ca70f56..0acca528 100755 --- a/usr/bin/byobu.in +++ b/usr/bin/byobu.in @@ -89,7 +89,7 @@ if [ "$#" = "1" ]; then fi # 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 fi diff --git a/usr/lib/byobu/include/config.py.in b/usr/lib/byobu/include/config.py.in index 419c77c2..fb0a17c6 100755 --- a/usr/lib/byobu/include/config.py.in +++ b/usr/lib/byobu/include/config.py.in @@ -362,7 +362,7 @@ def autolaunch(): return 1 except: 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 0 diff --git a/usr/share/byobu/profiles/Makefile.am b/usr/share/byobu/profiles/Makefile.am index e7fb2e4f..14763c2d 100644 --- a/usr/share/byobu/profiles/Makefile.am +++ b/usr/share/byobu/profiles/Makefile.am @@ -1,2 +1,2 @@ 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 diff --git a/etc/profile.d/Z97-byobu.sh.in b/usr/share/byobu/profiles/Z97-byobu.sh.in similarity index 100% rename from etc/profile.d/Z97-byobu.sh.in rename to usr/share/byobu/profiles/Z97-byobu.sh.in