usr/bin/byobu-janitor: clean up launch gardening code

This commit is contained in:
Dustin Kirkland 2010-06-24 12:14:07 -05:00
commit 5dbf0b1731
2 changed files with 5 additions and 4 deletions

1
debian/changelog vendored
View file

@ -21,6 +21,7 @@ byobu (2.81) unreleased; urgency=low
text, per feedback from Turnkey Linux users text, per feedback from Turnkey Linux users
* debian/release,sh, debian/release-build.sh: drop, no longer needed, * debian/release,sh, debian/release-build.sh: drop, no longer needed,
now in lp:~kirkland/+junk/bin now in lp:~kirkland/+junk/bin
* usr/bin/byobu-janitor: clean up launch gardening code
-- Dustin Kirkland <kirkland@ubuntu.com> Wed, 16 Jun 2010 12:46:29 -0500 -- Dustin Kirkland <kirkland@ubuntu.com> Wed, 16 Jun 2010 12:46:29 -0500

View file

@ -108,7 +108,7 @@ sed -i "s/^network-.*=/network=/" "$HOME/.$PKG/status"
# Affects: Upgrades from <= byobu-2.16 # Affects: Upgrades from <= byobu-2.16
# screen-launcher was renamed byobu-launcher; if the user has byobu # screen-launcher was renamed byobu-launcher; if the user has byobu
# set to auto-launch, update their configuration to use the byobu-launcher # set to auto-launch, update their configuration to use the byobu-launcher
if grep -qs "screen-launcher$" "$HOME/.profile"; then if grep -qs " screen-launcher" "$HOME/.profile"; then
byobu-launcher-install byobu-launcher-install
fi fi
@ -132,13 +132,13 @@ done
# Affects: Upgrades from <= byobu-2.57 that autolaunch # Affects: Upgrades from <= byobu-2.57 that autolaunch
# If the global autolaunch is on, then remove duplicate entry in ~/.profile # If the global autolaunch is on, then remove duplicate entry in ~/.profile
if [ -h "/etc/profile.d/Z98-$PKG.sh" ]; then if [ -h "/etc/profile.d/Z98-$PKG.sh" ]; then
sed -i "/$PKG-launcher$/d" "$HOME"/.profile || true sed -i "/ $PKG-launcher/d" "$HOME"/.profile || true
fi fi
# Affects: Upgrades from <= byobu-2.70 that autolaunch # Affects: Upgrades from <= byobu-2.70 that autolaunch
# Update the byobu-launch line, if necessary # Update the byobu-launch line, if necessary
if grep -qs "^\`echo \$- | grep -qs i\` && $PKG-launcher$" "$HOME"/.profile; then if grep -qs " $PKG-launcher$" "$HOME"/.profile; then
$PKG-launcher-uninstall && $PKG-launcher-install $PKG-launcher-install
fi fi
# Clean up flag # Clean up flag