* usr/bin/byobu, usr/bin/byobu-ctrl-a, usr/bin/byobu-disable,

usr/bin/byobu-enable, usr/bin/byobu-export, usr/bin/byobu-janitor,
  usr/bin/byobu-launch, usr/bin/byobu-launcher, usr/bin/byobu-
  launcher-install, usr/bin/byobu-launcher-uninstall, usr/bin/byobu-
  quiet, usr/bin/byobu-reconnect-sockets, usr/bin/byobu-select-
  backend, usr/bin/byobu-select-profile, usr/bin/byobu-shell,
  usr/bin/byobu-silent, usr/bin/byobu-status, usr/bin/byobu-status-
  detail, usr/bin/byobu-ugraph, usr/bin/byobu-ulevel,
  usr/lib/byobu/include/dirs, usr/share/byobu/profiles/byoburc:
  - big changeset to solve two annoying bugs, LP: #897473, #861291
  - take over ~/.byoburc, and use it for storing global byobu shell
    configuration, namely BYOBU_PREFIX when necessary
    + note that some users might have previously used ~/.byoburc to
      store byobu-only screen configuration
    + these users should now use ~/.byobu/.screenrc instead (also
      because byobu now supports both screen and tmux)
  - on first run, if byobu is running outside of its normal location
    in /usr/bin/byobu, it will automatically detect and append the
    correct BYOBU_PREFIX value and store it in ~/.byoburc
  - ~/.byoburc is now read by all usr/bin/* in order to find the
    correct prefix

README

@@ -20,8 +20,7 @@ install locally, using the following instructions...
  5) Install:
       make install
  6) Update your PATH and BYOBU_PREFIX environment variables
-      echo "export BYOBU_PREFIX=$HOME/byobu" >> $HOME/.bashrc
+      echo "export PATH=$HOME/byobu/bin:$PATH" >> $HOME/.bashrc
-      echo "export PATH=$BYOBU_PREFIX/bin:$PATH" >> $HOME/.bashrc
       . $HOME/.bashrc
  7) Run:
       byobu

debian/changelog

@@ -2,6 +2,27 @@ byobu (4.53) unreleased; urgency=low
 
   * usr/share/byobu/profiles/common: LP: #900812
     - start screen with at least a 1 second message wait
+  * usr/bin/byobu, usr/bin/byobu-ctrl-a, usr/bin/byobu-disable,
+    usr/bin/byobu-enable, usr/bin/byobu-export, usr/bin/byobu-janitor,
+    usr/bin/byobu-launch, usr/bin/byobu-launcher, usr/bin/byobu-
+    launcher-install, usr/bin/byobu-launcher-uninstall, usr/bin/byobu-
+    quiet, usr/bin/byobu-reconnect-sockets, usr/bin/byobu-select-
+    backend, usr/bin/byobu-select-profile, usr/bin/byobu-shell,
+    usr/bin/byobu-silent, usr/bin/byobu-status, usr/bin/byobu-status-
+    detail, usr/bin/byobu-ugraph, usr/bin/byobu-ulevel,
+    usr/lib/byobu/include/dirs, usr/share/byobu/profiles/byoburc:
+    - big changeset to solve two annoying bugs, LP: #897473, #861291
+    - take over ~/.byoburc, and use it for storing global byobu shell
+      configuration, namely BYOBU_PREFIX when necessary
+      + note that some users might have previously used ~/.byoburc to
+        store byobu-only screen configuration
+      + these users should now use ~/.byobu/.screenrc instead (also
+        because byobu now supports both screen and tmux)
+    - on first run, if byobu is running outside of its normal location
+      in /usr/bin/byobu, it will automatically detect and append the
+      correct BYOBU_PREFIX value and store it in ~/.byoburc
+    - ~/.byoburc is now read by all usr/bin/* in order to find the
+      correct prefix
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Mon, 05 Dec 2011 08:59:08 -0600
 

usr/bin/byobu

@@ -37,6 +37,20 @@ case "$0" in
 	*byobu-tmux) BYOBU_BACKEND="tmux" ;;
 esac
 
+# Source local byobu config
+if [ -r "$HOME/.byoburc" ]; then
+	# Ensure that this configuration is usable
+	. "$HOME/.byoburc" || mv -f "$HOME/.byoburc".orig
+fi
+if [ -z "${BYOBU_PREFIX}" ]; then
+	# Find and export the installation location prefix
+	prefix="$(dirname $(dirname $(readlink -f $0)))"
+	if [ "$prefix" != "/usr" ]; then
+		echo "export BYOBU_PREFIX='$prefix'" >> "$HOME/.byoburc"
+		. "$HOME/.byoburc"
+	fi
+fi
+[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
 [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
 . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 
@@ -81,7 +95,7 @@ case $BYOBU_BACKEND in
 		# Use 256 colors, unless the user has overridden
 		[ -z "$SCREEN_TERM" ] && SCREEN_TERM="-2"
 		PROFILE="-f $BYOBU_PREFIX/share/$PKG/profiles/tmuxrc"
-		sessions=$($BYOBU_BACKEND list-sessions) || true
+		sessions=$($BYOBU_BACKEND list-sessions 2>/dev/null) || true
 	;;
 	*)
 		# Allow override of default window list, with BYOBU_WINDOWS environment variable
@@ -107,7 +121,7 @@ case $BYOBU_BACKEND in
 		fi
 		# Some users want to maintain separate configurations
 		# if they use both GNU Screen and byobu on the same system
-		if [ -r "$HOME/.byoburc" ]; then
+		if [ -r "$BYOBU_CONFIG_DIR/.screenrc" ]; then
 			PROFILE="-c $BYOBU_PREFIX/share/$PKG/profiles/byoburc"
 		else
 			PROFILE="-c $BYOBU_PREFIX/share/$PKG/profiles/screenrc"

usr/bin/byobu-ctrl-a

@@ -26,6 +26,7 @@ EOF
 }
 
 PKG="byobu"
+[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
 [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
 . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 

usr/bin/byobu-disable

@@ -18,6 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 PKG="byobu"
+[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
 [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
 . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 

usr/bin/byobu-enable

@@ -18,6 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 PKG="byobu"
+[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
 [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
 . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 

usr/bin/byobu-export

@@ -18,6 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 PKG="byobu"
+[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
 [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
 . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 

usr/bin/byobu-janitor

@@ -20,6 +20,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 PKG="byobu"
+[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
 [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
 . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 

usr/bin/byobu-launch

@@ -42,6 +42,7 @@ elif [ "$BYOBU_SOURCED_PROFILE" != "1" ] && [ "$LC_BYOBU" != "0" ] && [ "$BYOBU_
 	unset _tty
 	BYOBU_SOURCED_PROFILE=1
 	PKG="byobu"
+	[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
 	[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
 	. "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 	# Ensure that autolaunch is not explicitly disabled

usr/bin/byobu-launcher

@@ -21,6 +21,7 @@ PKG="byobu"
 # Bad things happen if you run byobu, but you don't own your $HOME
 # ie, rather than "sudo byobu", you must run "sudo -H byobu"
 if [ -O "$HOME" ]; then
+	[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
 	[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
 	. "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 	if [ -e "$BYOBU_CONFIG_DIR/disable-autolaunch" ]; then

usr/bin/byobu-launcher-install

@@ -19,6 +19,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 PKG="byobu"
+[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
 [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
 . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 

usr/bin/byobu-launcher-uninstall

@@ -19,6 +19,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 PKG="byobu"
+[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
 [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
 . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 

usr/bin/byobu-quiet

@@ -18,6 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 PKG="byobu"
+[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
 [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
 . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 

usr/bin/byobu-reconnect-sockets

@@ -22,6 +22,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 PKG="byobu"
+[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
 [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
 . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 

usr/bin/byobu-select-backend

@@ -19,6 +19,7 @@
 
 
 PKG="byobu"
+[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
 [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
 . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 

usr/bin/byobu-select-profile

@@ -23,6 +23,7 @@
 #	./debian/rules get-po
 
 PKG="byobu"
+[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
 [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
 . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 

usr/bin/byobu-shell

@@ -18,6 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 PKG="byobu"
+[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
 [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
 . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 

usr/bin/byobu-silent

@@ -18,6 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 PKG="byobu"
+[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
 [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
 . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 

usr/bin/byobu-status

@@ -19,6 +19,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 PKG="byobu"
+[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
 [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
 . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 

usr/bin/byobu-status-detail

@@ -18,6 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 PKG="byobu"
+[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
 [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
 . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 

usr/bin/byobu-ugraph

@@ -25,6 +25,7 @@
 #---------------------------------------------------------------------
 
 PKG="byobu"
+[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
 [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
 . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 

usr/bin/byobu-ulevel

@@ -36,6 +36,7 @@
 # command-line option.
 
 PKG="byobu"
+[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
 [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
 . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 

usr/lib/byobu/include/dirs

@@ -21,6 +21,7 @@
 PKG="byobu"
 
 # Some users build and install byobu themselves, rather than from a distro
+[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
 [ -n "$BYOBU_PREFIX" ] || BYOBU_PREFIX="/usr"
 
 # Create and export the user configuration directory

usr/share/byobu/profiles/byoburc

@@ -24,4 +24,4 @@
 
 source $BYOBU_CONFIG_DIR/profile
 source $BYOBU_WINDOWS
-source $HOME/.byoburc
+source $BYOBU_CONFIG_DIR/.screenrc