From fc3285e0146c4667ab081e097b402e3291e3807b Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Tue, 23 Aug 2011 22:59:48 -0500 Subject: [PATCH] * usr/bin/byobu-janitor, usr/share/byobu/profiles/common: - deprecate backticks file, no longer needed --- debian/changelog | 2 ++ usr/bin/byobu-janitor | 14 -------------- usr/share/byobu/profiles/common | 1 - 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3059a68e..4582cea0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ byobu (4.31) unreleased; urgency=low * usr/bin/byobu, usr/lib/byobu/.shutil: - fix bold color printing + * usr/bin/byobu-janitor, usr/share/byobu/profiles/common: + - deprecate backticks file, no longer needed -- Dustin Kirkland Sun, 21 Aug 2011 21:12:43 -0700 diff --git a/usr/bin/byobu-janitor b/usr/bin/byobu-janitor index 01cf3bdf..5aa8b0a0 100755 --- a/usr/bin/byobu-janitor +++ b/usr/bin/byobu-janitor @@ -23,19 +23,6 @@ PKG="byobu" [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX . "${BYOBU_PREFIX}/lib/${PKG}/.common" -# Source configurations and disable unused backticks -for i in "$BYOBU_PREFIX/share/$PKG/status/status" "$BYOBU_CONFIG_DIR/status"; do - [ -r "$i" ] && . "$i" -done -rm -f "$BYOBU_CONFIG_DIR/backticks" -for i in "$BYOBU_PREFIX/lib/$PKG/"*; do - i=${i##*/} - eval x="\$$i" || true - if [ "$x" != "1" ]; then - num=$(grep "^backtick.*byobu-status $i$" "$BYOBU_PREFIX/share/$PKG/profiles/common" | awk '{print $2}') - [ -n "$num" ] && echo "backtick $num # $i" >> "$BYOBU_CONFIG_DIR/backticks" - fi -done # Ensure that all updates get run immediately rm -rf "$BYOBU_RUN_DIR/.last.$BYOBU_BACKEND" @@ -67,7 +54,6 @@ fi [ -r "$BYOBU_CONFIG_DIR/profile.tmux" ] || echo "source-file $BYOBU_PREFIX/share/$PKG/profiles/tmux" > "$BYOBU_CONFIG_DIR/profile.tmux" [ -r "$BYOBU_CONFIG_DIR/keybindings" ] || echo "source $BYOBU_PREFIX/share/$PKG/keybindings/common" > "$BYOBU_CONFIG_DIR/keybindings" [ -r "$BYOBU_CONFIG_DIR/windows" ] || touch "$BYOBU_CONFIG_DIR/windows" -[ -r "$BYOBU_CONFIG_DIR/backticks" ] || touch "$BYOBU_CONFIG_DIR/backticks" [ -r "$HOME/.screenrc" ] || touch "$HOME/.screenrc" for f in status statusrc; do if [ ! -r "$BYOBU_CONFIG_DIR/$f" ]; then diff --git a/usr/share/byobu/profiles/common b/usr/share/byobu/profiles/common index c0146602..facbd739 100644 --- a/usr/share/byobu/profiles/common +++ b/usr/share/byobu/profiles/common @@ -89,4 +89,3 @@ hardstatus string '%12`%1003`%=%1004`' # * http://savannah.gnu.org/bugs/?22146 source $BYOBU_CONFIG_DIR/keybindings -source $BYOBU_CONFIG_DIR/backticks