From 07ec97e82e5882b32e38d54a64d10aa6b8b59e99 Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Wed, 10 Aug 2011 16:44:46 -0500 Subject: [PATCH] * usr/bin/byobu-janitor: - get the status/statusrc seeding working again, and ec2_cost enabled on ec2 systems by default again --- debian/changelog | 3 +++ usr/bin/byobu-janitor | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index c3e4749b..fdfa109f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,9 @@ byobu (4.26) unreleased; urgency=low usr/share/byobu/profiles/Makefile.am, usr/share/byobu/profiles/tmux, usr/share/byobu/profiles/tmuxrc: - initial support for launching tmux + * usr/bin/byobu-janitor: + - get the status/statusrc seeding working again, and ec2_cost enabled + on ec2 systems by default again -- Dustin Kirkland Thu, 04 Aug 2011 17:57:12 -0500 diff --git a/usr/bin/byobu-janitor b/usr/bin/byobu-janitor index e7d11d95..a5310047 100755 --- a/usr/bin/byobu-janitor +++ b/usr/bin/byobu-janitor @@ -52,13 +52,11 @@ 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/status" ] || touch "$BYOBU_CONFIG_DIR/status" -[ -r "$BYOBU_CONFIG_DIR/statusrc" ] || touch "$BYOBU_CONFIG_DIR/statusrc" [ -r "$HOME/.screenrc" ] || touch "$HOME/.screenrc" for f in status statusrc; do if [ ! -r "$BYOBU_CONFIG_DIR/$f" ]; then # Copy from skeleton, if possible - [ -r "/etc/$PKG/$f" ] && cp -f /etc/$PKG/$f "$BYOBU_CONFIG_DIR/$f" + cp -f "$BYOBU_PREFIX/share/$PKG/status/$f" "$BYOBU_CONFIG_DIR/$f" if [ "$f" = "status" ] && metadata_available; then # Enable ec2_cost if we're in ec2 $SED -i -e "s/ec2_cost=.*/ec2_cost=1/" "$BYOBU_CONFIG_DIR/$f"