From 5915972abf052cbae68529ebf99f7824c544c132 Mon Sep 17 00:00:00 2001
From: Dustin Kirkland <kirkland@ubuntu.com>
Date: Wed, 9 Nov 2011 17:48:45 -0600
Subject: [PATCH] * usr/bin/byobu-ctrl-a, usr/bin/byobu-janitor: LP: #882435  
 - use BYOBU_PREFIX in a couple of places to allow better portability

---
 debian/changelog      | 2 ++
 usr/bin/byobu-ctrl-a  | 2 +-
 usr/bin/byobu-janitor | 6 +++---
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d61b8a65..33b43a24 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -81,6 +81,8 @@ byobu (4.47) unreleased; urgency=low
     - use printf instead of "echo -n" for portability to Mac OSX
   * experimental/byobu-classroom: LP: #882813
     - fix minor use $SED
+  * usr/bin/byobu-ctrl-a, usr/bin/byobu-janitor: LP: #882435
+    - use BYOBU_PREFIX in a couple of places to allow better portability
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Tue, 08 Nov 2011 19:16:15 -0600
 
diff --git a/usr/bin/byobu-ctrl-a b/usr/bin/byobu-ctrl-a
index 68131a1e..8be1fc5a 100755
--- a/usr/bin/byobu-ctrl-a
+++ b/usr/bin/byobu-ctrl-a
@@ -75,7 +75,7 @@ case "$bind_to" in
 		echo 'escape "^Aa"' >> "$keybindings"
 		echo 'register x "^A"' >> "$keybindings"
 		echo 'bindkey "^A"' >> "$keybindings"
-		echo 'source /usr/share/doc/tmux/examples/screen-keys.conf' > "$keybindings.tmux"
+		echo "source \$BYOBU_PREFIX/share/doc/tmux/examples/screen-keys.conf" > "$keybindings.tmux"
 		echo "INFO: ctrl-a will now operate in GNU Screen mode"
 		break
 	;;
diff --git a/usr/bin/byobu-janitor b/usr/bin/byobu-janitor
index d6761ed8..3f404ef6 100755
--- a/usr/bin/byobu-janitor
+++ b/usr/bin/byobu-janitor
@@ -56,9 +56,9 @@ fi
 # Seed the configuration
 # Setup initial local user configuration
 [ -r "$BYOBU_CONFIG_DIR/color" ] || printf "BACKGROUND=k\nFOREGROUND=w\nMONOCHROME=0" > "$BYOBU_CONFIG_DIR/color"
-[ -r "$BYOBU_CONFIG_DIR/profile" ] || echo "source $BYOBU_PREFIX/share/$PKG/profiles/common" > "$BYOBU_CONFIG_DIR/profile"
-[ -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/profile" ] || echo "source \$BYOBU_PREFIX/share/$PKG/profiles/common" > "$BYOBU_CONFIG_DIR/profile"
+[ -r "$BYOBU_CONFIG_DIR/profile.tmux" ] || echo "source \$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 "$HOME/.screenrc" ] || touch "$HOME/.screenrc"
 [ -r "$BYOBU_CONFIG_DIR/.tmux.conf" ] || touch "$BYOBU_CONFIG_DIR/.tmux.conf"