releasing 5.54

This commit is contained in:
Dustin Kirkland 2013-08-07 12:49:26 +01:00
commit 1433649a2e
2 changed files with 15 additions and 5 deletions

8
debian/changelog vendored
View file

@ -1,8 +1,10 @@
byobu (5.54) unreleased; urgency=low byobu (5.54-0ubuntu1) saucy; urgency=low
* UNRELEASED * usr/bin/byobu-janitor: LP: #1208844
- only enable the byobu prompt by default if the bashrc is stock;
ie, hasn't been locally modified
-- Dustin Kirkland <kirkland@ubuntu.com> Tue, 06 Aug 2013 22:56:38 +0100 -- Dustin Kirkland <kirkland@ubuntu.com> Wed, 07 Aug 2013 12:49:24 +0100
byobu (5.53-0ubuntu1) saucy; urgency=low byobu (5.53-0ubuntu1) saucy; urgency=low

View file

@ -113,9 +113,17 @@ killall -u $USER byobu-statusd >/dev/null 2>&1 || true
# Clean up flag (new and old) # Clean up flag (new and old)
rm -f "$FLAG" "/var/run/screen/S-$USER/$PKG.reload-required" rm -f "$FLAG" "/var/run/screen/S-$USER/$PKG.reload-required"
# Affects: Upgrades from <= byobu 5.50, install byobu prompt # Affects: Upgrades from <= byobu 5.50, install byobu prompt if using stock bashrc
if ! (grep -qs "#byobu-prompt#$" "$HOME/.bashrc") && ! [ -e "$BYOBU_CONFIG_DIR/prompt" ]; then if ! (grep -qs "#byobu-prompt#$" "$HOME/.bashrc") && ! [ -e "$BYOBU_CONFIG_DIR/prompt" ]; then
printf "[ -r $BYOBU_CONFIG_DIR/prompt ] && . $BYOBU_CONFIG_DIR/prompt #byobu-prompt#\n" >> "$HOME/.bashrc" if $BYOBU_TEST diff >/dev/null 2>&1; then
if diff /etc/skel/.bashrc "$HOME/.bashrc" >/dev/null 2>&1; then
printf "[ -r $BYOBU_CONFIG_DIR/prompt ] && . $BYOBU_CONFIG_DIR/prompt #byobu-prompt#\n" >> "$HOME/.bashrc"
fi
elif $BYOBU_TEST md5sum >/dev/null 2>&1; then
if [ "$(cat /etc/skel/.bashrc | md5sum)" = "$(cat $HOME/.bashrc | md5sum)" ]; then
printf "[ -r $BYOBU_CONFIG_DIR/prompt ] && . $BYOBU_CONFIG_DIR/prompt #byobu-prompt#\n" >> "$HOME/.bashrc"
fi
fi
fi fi
[ -r "$BYOBU_CONFIG_DIR/prompt" ] || printf "[ -r ${BYOBU_PREFIX}/share/${PKG}/profiles/bashrc ] && . ${BYOBU_PREFIX}/share/${PKG}/profiles/bashrc #byobu-prompt#\n" > "$BYOBU_CONFIG_DIR/prompt" [ -r "$BYOBU_CONFIG_DIR/prompt" ] || printf "[ -r ${BYOBU_PREFIX}/share/${PKG}/profiles/bashrc ] && . ${BYOBU_PREFIX}/share/${PKG}/profiles/bashrc #byobu-prompt#\n" > "$BYOBU_CONFIG_DIR/prompt"