Merge lp:~jefferyto/byobu/misc-updates into lp:byobu

[Jeffery To]

There isn't a major theme to these changes, just things I noticed while working on porting byobu to OpenWrt (but aren't critical enough that I needed to patch right away).

There is one fix (trailing "#" sign for usr/lib/byobu/users). Originally it was working for screen but broken for tmux, then I fixed tmux but (unwittingly) broke screen. Now it should work for both.

I imagine the "create new config dir in ~/.config" change may be somewhat controversial. I think at this point most users will have a ~/.config directory and keeping $HOME clean(er) is a good thing.

[Jeffery To (jefferyto)]

Should I separate these changes into separate branches/merge requests?

[Dustin Kirkland  (kirkland)]

Hi Jeffrey,

Yeah, these are a lot of changes. I'm struggling to review all of them, as a monolith.

[Jeffery To (jefferyto)]

> Hi Jeffrey,
>
> Yeah, these are a lot of changes. I'm struggling to review all of them, as a
> monolith.

I can submit them one at a time (the first one is at https://code.launchpad.net/~jefferyto/byobu/fix-trailing-hash/+merge/379412) but I would prefer not to wait 6 months for a review.

[Jeffery To (jefferyto)]

I can submit all of the changes in separate merge requests all at once, but since they all include an update to debian/changelog, they will all conflict with each other.

Do you want me to submit all of the changes all at once and you will resolve the conflicts, or do you want me to submit them one at a time?

Unmerged revisions

2640. By Jeffery To on 2019-06-17

* usr/bin/byobu-status-detail.in,
  usr/bin/byobu-status.in:
  - Remove unnecessary backticks; the command returns no output, only
    the exit value is tested

2639. By Jeffery To on 2019-06-17

* usr/bin/byobu-ctrl-a.in,
  usr/bin/byobu-janitor.in,
  usr/share/byobu/keybindings/f-keys.screen,
  usr/share/byobu/keybindings/f-keys.tmux:
  - Fix ^A unbinding: ^A is bound in f-keys.screen / f-keys.tmux to
    autorun byobu-ctrl-a, but if the user selected a different key in
    byobu-config, it would unbind the custom key instead of ^A
  - Use functions to help make the logic easier to understand
  - Add "custom" and "manual" modes, that only unbind ^A ("emacs" mode
    would also set prefix to F12 for tmux, possibly overriding the
    user's custom prefix); "custom" when it is detected that the user
    has customized their prefix before byobu-ctrl-a was run for the
    first time, "manual" when the user just wants to disable the
    autorun
  - Add an "autorun" command line option, used when byobu-ctrl-a is
    triggered by the user pressing ^A; in this case, byobu-ctrl-a will
    wait for the user to press enter/return before exiting, so that
    the user can read the text output before the window auto-closes
  - Add a quit option, so that the user can exit byobu-ctrl-a without
    making any changes

2638. By Jeffery To on 2019-06-17

* usr/bin/byobu-status.in:
  - Include $BYOBU_CONFIG_DIR/datetime.tmux in the sourcing for loop

2637. By Jeffery To on 2019-06-17

* usr/bin/byobu-select-profile.in:
  - Update help message
  - Remove $BYOBU_CONFIG_DIR/profile test, it is not used directly in
    the script
  - Restore list colors functionality
  - Use local variables in functions
  - Simplify color calculation
  - Exit when --list / --help / invalid options are specified, before
    making changes
  - Removed -- option, command utilities that have a -- option expect
    data to come after the --

2636. By Jeffery To on 2019-06-17

* usr/bin/byobu-janitor.in:
  - Remove unused variables

2635. By Jeffery To on 2019-06-17

* usr/bin/byobu-export.in,
  usr/bin/byobu-janitor.in,
  usr/bin/byobu-launch.in,
  usr/bin/byobu-select-profile.in,
  usr/bin/byobu-status-detail.in,
  usr/bin/byobu-status.in,
  usr/bin/byobu.in,
  usr/lib/byobu/battery,
  usr/lib/byobu/disk_io,
  usr/lib/byobu/hostname,
  usr/lib/byobu/include/common,
  usr/lib/byobu/include/constants,
  usr/lib/byobu/include/shutil,
  usr/lib/byobu/ip_address,
  usr/lib/byobu/memory,
  usr/lib/byobu/release,
  usr/lib/byobu/updates_available,
  usr/lib/byobu/whoami,
  usr/lib/byobu/wifi_quality:
  - Add (and use) a byobu_test function to wrap $BYOBU_TEST

2634. By Jeffery To on 2019-06-16

* usr/bin/byobu.in:
  - Remove exporting of $BYOBU_BACKEND, this is already done in
    usr/lib/byobu/include/constants

2633. By Jeffery To on 2019-06-16

* usr/lib/byobu/include/constants:
  - Remove sourcing of files looking for $BYOBU_BACKEND, this is
    already done in usr/lib/byobu/include/common

2632. By Jeffery To on 2019-06-16

* usr/bin/byobu-status-detail.in:
  - Use $BYOBU_TEST

2631. By Jeffery To on 2019-06-16

* usr/bin/byobu.in:
  - Replace $HOME/.$PKG with $BYOBU_CONFIG_DIR

=== modified file 'debian/changelog'
--- debian/changelog	2019-06-12 23:41:10 +0000
+++ debian/changelog	2019-06-17 20:09:21 +0000
@@ -2,6 +2,102 @@
 
   * UNRELEASED
 
+  [ Jeffery To ]
+  * usr/bin/byobu-ctrl-a.in,
+    usr/bin/byobu-janitor.in,
+    usr/share/byobu/keybindings/f-keys.screen,
+    usr/share/byobu/keybindings/f-keys.tmux:
+    - Fix ^A unbinding: ^A is bound in f-keys.screen / f-keys.tmux to
+      autorun byobu-ctrl-a, but if the user selected a different key in
+      byobu-config, it would unbind the custom key instead of ^A
+    - Use functions to help make the logic easier to understand
+    - Add "custom" and "manual" modes, that only unbind ^A ("emacs" mode
+      would also set prefix to F12 for tmux, possibly overriding the
+      user's custom prefix); "custom" when it is detected that the user
+      has customized their prefix before byobu-ctrl-a was run for the
+      first time, "manual" when the user just wants to disable the
+      autorun
+    - Add an "autorun" command line option, used when byobu-ctrl-a is
+      triggered by the user pressing ^A; in this case, byobu-ctrl-a will
+      wait for the user to press enter/return before exiting, so that
+      the user can read the text output before the window auto-closes
+    - Add a quit option, so that the user can exit byobu-ctrl-a without
+      making any changes
+  * usr/bin/byobu-export.in,
+    usr/bin/byobu-janitor.in,
+    usr/bin/byobu-launch.in,
+    usr/bin/byobu-select-profile.in,
+    usr/bin/byobu-status-detail.in,
+    usr/bin/byobu-status.in,
+    usr/bin/byobu.in,
+    usr/lib/byobu/battery,
+    usr/lib/byobu/disk_io,
+    usr/lib/byobu/hostname,
+    usr/lib/byobu/include/common,
+    usr/lib/byobu/include/constants,
+    usr/lib/byobu/include/shutil,
+    usr/lib/byobu/ip_address,
+    usr/lib/byobu/memory,
+    usr/lib/byobu/release,
+    usr/lib/byobu/updates_available,
+    usr/lib/byobu/whoami,
+    usr/lib/byobu/wifi_quality:
+    - Add (and use) a byobu_test function to wrap $BYOBU_TEST
+  * usr/bin/byobu.in:
+    - Use "sh -n" to check $HOME/.byoburc, to avoid sourcing a
+      partially valid file
+    - Remove redundant sourcing of $HOME/.byoburc
+    - Set BYOBU_BACKEND before sourcing usr/lib/byobu/include/common, so
+      the latter doesn't need to look for a backend
+    - Remove sourcing of $BYOBU_CONFIG_DIR/backend, it is already
+      sourced by usr/lib/byobu/include/common
+    - Remove exporting of $BYOBU_BACKEND, this is already done in
+      usr/lib/byobu/include/constants
+    - Replace $HOME/.$PKG with $BYOBU_CONFIG_DIR
+  * usr/bin/byobu.in,
+    usr/share/byobu/profiles/byoburc,
+    usr/share/byobu/profiles/Makefile.am:
+    - Remove usr/share/byobu/profile/byoburc, since there are no longer
+      separate ".screenrc" and ".byoburc" configurations and it is
+      exactly the same as usr/share/byobu/profile/screenrc
+  * usr/bin/byobu-janitor.in:
+    - Remove unused variables
+  * usr/bin/byobu-status-detail.in:
+    - Use $BYOBU_TEST
+  * usr/bin/byobu-status-detail.in,
+    usr/bin/byobu-status.in:
+    - Remove unnecessary backticks; the command returns no output, only
+      the exit value is tested
+  * usr/bin/byobu-status.in:
+    - Include $BYOBU_CONFIG_DIR/datetime.tmux in the sourcing for loop
+  * usr/bin/byobu-status.in,
+    usr/lib/byobu/include/common,
+    usr/lib/byobu/include/dirs.in:
+    - Remove unnecessary directory existence test before "mkdir -p"
+  * usr/bin/byobu-select-profile.in:
+    - Update help message
+    - Remove $BYOBU_CONFIG_DIR/profile test, it is not used directly in
+      the script
+    - Restore list colors functionality
+    - Use local variables in functions
+    - Simplify color calculation
+    - Exit when --list / --help / invalid options are specified, before
+      making changes
+    - Removed -- option, command utilities that have a -- option expect
+      data to come after the --
+  * usr/lib/byobu/include/constants:
+    - Remove sourcing of files looking for $BYOBU_BACKEND, this is
+      already done in usr/lib/byobu/include/common
+  * usr/lib/byobu/include/dirs.in:
+    - Use BYOBU_CONFIG_DIR or XDG_CONFIG_HOME even if they do not exist
+    - Create new config dir in ~/.config, if it exists
+    - Use XDG_CACHE_HOME even if it does not exist
+  * usr/lib/byobu/users:
+    - Fix trailing '#' sign for screen
+  * usr/share/byobu/profiles/screenrc,
+    usr/share/byobu/profiles/tmuxrc:
+    - Fix header comment
+
  -- Dustin Kirkland <[e-mail]>  Wed, 12 Jun 2019 18:41:09 -0500
 
 byobu (5.129-0ubuntu1) eoan; urgency=medium
 
=== modified file 'usr/bin/byobu-ctrl-a.in'
--- usr/bin/byobu-ctrl-a.in	2017-08-15 06:51:04 +0000
+++ usr/bin/byobu-ctrl-a.in	2019-06-17 20:09:21 +0000
@@ -17,11 +17,11 @@
 #    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-Usage() {
+usage() {
 	cat <<EOF
 Usage: ${0##*/} [mode]
-   mode is one of 'screen' or 'emacs'
-   if not specified, prompt the user
+    mode is one of 'screen' or 'emacs'
+    if not specified, prompt the user
 EOF
 }
 
@@ -30,47 +30,119 @@
 [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
 . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 
-bind_to=""
+bind_to=
+is_autorun=
+is_autorun_disabled=
 keybindings="$BYOBU_CONFIG_DIR/keybindings"
 [ "$BYOBU_BACKEND" = "tmux" ] && keybindings="$keybindings.tmux"
 touch "$keybindings"
 
+# may not work if a custom key was selected before (with ^${KEY} unbound)
+case $BYOBU_BACKEND in
+	screen) s='^bindkey "\^A"' ;;
+	tmux)   s="^unbind-key -n C-a" ;;
+esac
+if grep -qs "$s" "$keybindings"; then
+	is_autorun_disabled=1
+fi
+
+# unbind ^A and not ^${KEY} because it is ^A in f-keys.screen / f-keys.tmux
+disable_autorun() {
+	local binding
+	case $BYOBU_BACKEND in
+		screen) binding='bindkey "^A"' ;;
+		tmux)   binding="unbind-key -n C-a" ;;
+	esac
+	echo "$binding" >> "$keybindings"
+}
+
+clear_mode_bindings() {
+	case $BYOBU_BACKEND in
+		screen)
+			$BYOBU_SED_INLINE -e "/^register x /d" -e "/^escape /d" "$keybindings"
+		;;
+		tmux)
+			$BYOBU_SED_INLINE -e "/^set -g prefix/d" -e "/ send-prefix/d" "$keybindings"
+		;;
+	esac
+}
+
+set_emacs_mode_bindings() {
+	case $BYOBU_BACKEND in
+		screen)
+			:
+		;;
+		tmux)
+			echo "set -g prefix F12" >> "$keybindings"
+		;;
+	esac
+}
+
+set_screen_mode_bindings() {
+	case $BYOBU_BACKEND in
+		screen)
+			echo "escape \"^$KEY$key\"" >> "$keybindings"
+			echo "register x \"^$KEY\"" >> "$keybindings"
+		;;
+		tmux)
+			if $BYOBU_BACKEND -V | grep " 1.5"; then
+				# tmux 1.5 supports a list of prefixes
+				echo "set -g prefix ^$KEY,F12" >> "$keybindings"
+			else
+				# tmux 1.6 and above supports prefix and prefix2
+				echo "set -g prefix ^$KEY" >> "$keybindings"
+				echo "set -g prefix2 F12" >> "$keybindings"
+			fi
+			echo "bind $key send-prefix" >> "$keybindings"
+		;;
+	esac
+}
+
+reload_profile() {
+	case $BYOBU_BACKEND in
+		screen)
+			$BYOBU_BACKEND -X at 0 source "$BYOBU_CONFIG_DIR/profile"
+		;;
+		tmux)
+			$BYOBU_BACKEND source "$BYOBU_PREFIX/share/byobu/profiles/tmuxrc" 2>/dev/null
+		;;
+	esac
+}
+
 # If the user has already chosen an escape sequence, then
-# presumably they want ctrl-a to operate in emacs mode
-case "$BYOBU_BACKEND" in
-	"screen")
-		if grep -qs "^escape" "$keybindings"; then
-			# Check for escape definition in local keybindings config
-			bind_to="emacs"
-		fi
-	;;
-	"tmux")
-		if grep -qs "^set -g prefix" "$keybindings"e;  then
-			# Check for escape definition in local keybindings config
-			bind_to="emacs"
-		fi
-		# Check for some other escape sequence in tmux keys
-		if $BYOBU_BACKEND list-keys 2>/dev/null | grep -qs "^bind-key\s\+[^a]\s\+send-prefix"; then
-			bind_to="emacs"
-		fi
-	;;
-esac
+# presumably they just want to disable autorun
+if [ -z "$is_autorun_disabled" ]; then
+	case $BYOBU_BACKEND in
+		screen)
+			if grep -qs "^escape" "$keybindings"; then
+				# Check for escape definition in local keybindings config
+				bind_to=custom
+			fi
+		;;
+		tmux)
+			if grep -qs "^set -g prefix" "$keybindings";  then
+				# Check for escape definition in local keybindings config
+				bind_to=custom
+			fi
+			# Check for some other escape sequence in tmux keys
+			if $BYOBU_BACKEND list-keys 2>/dev/null | grep "\ssend-prefix$" | grep -vqs "\sa\s\+send-prefix$"; then
+				bind_to=custom
+			fi
+		;;
+	esac
+fi
 
-case "${1}" in
-	-h|--help) Usage; exit 0;;
-	screen) bind_to="screen";;
-	emacs) bind_to="emacs";;
+case $1 in
+	-h|--help) usage; exit 0 ;;
+	screen) bind_to=screen ;;
+	emacs) bind_to=emacs ;;
+	autorun) is_autorun=1 ;;
 	"") :;;
-	*) { Usage printf "%s\n" "Bad argument $1"; } 1>&2; exit 1;;
+	*) { usage; printf "%s\n" "Bad argument: $1"; } 1>&2; exit 1;;
 esac
 
-if [ "${2}" ]; then
-	KEY=$(printf "$2" | $BYOBU_SED 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/')
-	key=$(printf "$2" | $BYOBU_SED 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/')
-else
-	KEY="A"
-	key="a"
-fi
+KEY=$(printf "${2:-A}" | $BYOBU_SED 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/')
+key=$(printf "$KEY"    | $BYOBU_SED 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/')
 
 while [ -z "$bind_to" ]; do
 	echo
@@ -79,72 +151,73 @@
 	echo "When you press ctrl-a in Byobu, do you want it to operate in:"
 	echo "    (1) Screen mode (GNU Screen's default escape sequence)"
 	echo "    (2) Emacs mode  (go to beginning of line)"
+	if [ -z "$is_autorun_disabled" ]; then
+		echo "    (M) Manual      (I will configure this manually, don't ask me anymore)"
+		echo "    (Q) Quit        (ask me again later)"
+	else
+		echo "    (Q) Quit        (no change)"
+	fi
 	echo
 	echo "Note that:"
 	echo "  - F12 also operates as an escape in Byobu"
 	echo "  - You can press F9 and choose your escape character"
 	echo "  - You can run 'byobu-ctrl-a' at any time to change your selection"
 	echo
-	printf "Select [1 or 2]: "
+	if [ -z "$is_autorun_disabled" ]; then
+		printf "Select [1 / 2 / M / Q]: "
+	else
+		printf "Select [1 / 2 / Q]: "
+	fi
 	s=$(head -n1)
 	echo
 	case "$s" in
 		1) bind_to="screen"; break;;
 		2) bind_to="emacs"; break;;
+		q|Q) break;;
+		m|M)
+			if [ -z "$is_autorun_disabled" ]; then
+				bind_to="manual"
+				break
+			fi
+		;;
 	esac
 done
 
 case "$bind_to" in
+	custom)
+		disable_autorun
+		reload_profile
+		echo "INFO: custom settings were found, no change to ctrl-a was made"
+	;;
+	manual)
+		disable_autorun
+		reload_profile
+		echo "INFO: ctrl-a will no longer cause this prompt to appear"
+	;;
 	emacs)
-		case "$BYOBU_BACKEND" in
-			screen)
-				$BYOBU_SED_INLINE -e "/^register x /d" -e "/^bindkey /d" -e "/^escape /d" "$keybindings"
-				echo "bindkey \"^${KEY}\"" >> "$keybindings"
-				$BYOBU_BACKEND -X at 0 source "$BYOBU_CONFIG_DIR/profile"
-			;;
-			tmux)
-				$BYOBU_SED_INLINE -e "/^set -g prefix/d" -e "/ send-prefix/d" -e "/^unbind-key -n C-${key}/d" "$keybindings"
-				echo "set -g prefix F12" >> "$keybindings"
-				echo "unbind-key -n C-${key}" >> "$keybindings"
-				$BYOBU_BACKEND source "$BYOBU_PREFIX/share/byobu/profiles/tmuxrc" 2>/dev/null
-			;;
-		esac
+		[ -n "$is_autorun_disabled" ] || disable_autorun
+		clear_mode_bindings
+		set_emacs_mode_bindings
+		reload_profile
 		echo "INFO: ctrl-a will now operate in emacs mode"
 	;;
 	screen)
-		case "$BYOBU_BACKEND" in
-			screen)
-				$BYOBU_SED_INLINE -e "/^register x /d" -e "/^bindkey \"^\"/d" -e "/^escape /d" "$keybindings"
-				echo "bindkey \"^${KEY}\"" >> "$keybindings"
-				echo "escape \"^${KEY}${key}\"" >> "$keybindings"
-				echo "register x \"^${KEY}\"" >> "$keybindings"
-				$BYOBU_BACKEND -X at 0 source "$BYOBU_CONFIG_DIR/profile"
-			;;
-			tmux)
-				$BYOBU_SED_INLINE -e "/^set -g prefix/d" -e "/ send-prefix/d" -e "/^unbind-key -n C-${key}/d" "$keybindings"
-				echo "unbind-key -n C-${key}" >> "$keybindings"
-				if $BYOBU_BACKEND -V | grep " 1.5"; then
-					# tmux 1.5 supports a list of prefixes
-					echo "set -g prefix ^${KEY},F12" >> "$keybindings"
-				else
-					# tmux 1.6 and above supports prefix and prefix2
-					echo "set -g prefix ^${KEY}" >> "$keybindings"
-					echo "set -g prefix2 F12" >> "$keybindings"
-				fi
-				echo "bind ${key} send-prefix" >> "$keybindings"
-				$BYOBU_BACKEND source "$BYOBU_PREFIX/share/byobu/profiles/tmuxrc" 2>/dev/null
-			;;
-		esac
+		[ -n "$is_autorun_disabled" ] || disable_autorun
+		clear_mode_bindings
+		set_screen_mode_bindings
+		reload_profile
 		echo "INFO: ctrl-a will now operate in GNU Screen mode"
 	;;
-	*)
-		echo "Error: bad value for binding: $bind_to"
-	;;
 esac
 
-if [ -z "${2}" ]; then
+if [ "$bind_to" != manual ]; then
 	echo "To modify this behavior again later, run 'byobu-ctrl-a'"
 	echo
 fi
 
+if [ -n "$is_autorun" ]; then
+	echo "Press enter/return to close this window..."
+	s=$(head -n1)
+fi
+
 # vi: syntax=sh ts=4 noexpandtab
 
=== modified file 'usr/bin/byobu-export.in'
--- usr/bin/byobu-export.in	2019-05-26 19:18:53 +0000
+++ usr/bin/byobu-export.in	2019-06-17 20:09:21 +0000
@@ -22,7 +22,7 @@
 [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
 . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 
-if eval $BYOBU_TEST gettext >/dev/null 2>&1; then
+if byobu_test gettext; then
 	command=gettext
 else
 	command=echo
 
=== modified file 'usr/bin/byobu-janitor.in'
--- usr/bin/byobu-janitor.in	2019-05-26 19:18:06 +0000
+++ usr/bin/byobu-janitor.in	2019-06-17 20:09:21 +0000
@@ -36,13 +36,9 @@
 	exit 0
 fi
 
-# Set the rest of the variables
-DEFAULT_PROFILE="light"
-PROFILE="$BYOBU_CONFIG_DIR/profile"
-
 # Create byobu-exchange buffer file, with secure permissions, if it doesn't exist
 if ! [ -e "$BYOBU_RUN_DIR/printscreen" ]; then
-	if eval $BYOBU_TEST install >/dev/null 2>&1; then
+	if byobu_test install; then
 		install -m 600 /dev/null "$BYOBU_RUN_DIR/printscreen"
 	else
 		cp /dev/null "$BYOBU_RUN_DIR/printscreen"
@@ -121,11 +117,11 @@
 # Affects: Upgrades from <= byobu 5.50, install byobu prompt if using stock bashrc
 if [ -r /etc/skel/.bashrc ] && [ -r "$HOME/.bashrc" ] && [ -w "$HOME/.bashrc" ] && \
 		! (grep -qs "#byobu-prompt#$" "$HOME/.bashrc") && ! [ -e "$BYOBU_CONFIG_DIR/prompt" ]; then
-	if eval $BYOBU_TEST diff >/dev/null 2>&1; then
+	if byobu_test diff; 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 eval $BYOBU_TEST md5sum >/dev/null 2>&1; then
+	elif byobu_test md5sum; 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
@@ -136,4 +132,14 @@
 # Affects: Upgrades from <= byobu 5.126, clear out ec2/rcs cost statuses
 rm -f "$BYOBU_RUN_DIR"/cache.tmux/ec2_cost* "$BYOBU_RUN_DIR"/cache.tmux/rcs_cost* "$BYOBU_RUN_DIR"/status.tmux/ec2_cost* "$BYOBU_RUN_DIR"/status.tmux/rcs_cost*
 
+# Affects: Upgrades from <= byobu 5.129, fix unbinding of ctrl-a binding (autorun byobu-ctrl-a)
+if grep '^bindkey "\^."$' "$BYOBU_CONFIG_DIR/keybindings" | grep -vqs '^bindkey "\^A"$'; then
+	$BYOBU_SED_INLINE -e '/^bindkey "\^."$/d' "$BYOBU_CONFIG_DIR/keybindings"
+	echo 'bindkey "^A"' >> "$BYOBU_CONFIG_DIR/keybindings"
+fi
+if grep "^unbind-key -n C-.$" "$BYOBU_CONFIG_DIR/keybindings.tmux" | grep -vqs "^unbind-key -n C-a$"; then
+	$BYOBU_SED_INLINE -e "/^unbind-key -n C-.$/d" "$BYOBU_CONFIG_DIR/keybindings.tmux"
+	echo "unbind-key -n C-a" >> "$BYOBU_CONFIG_DIR/keybindings.tmux"
+fi
+
 # vi: syntax=sh ts=4 noexpandtab
 
=== modified file 'usr/bin/byobu-launch.in'
--- usr/bin/byobu-launch.in	2019-05-26 19:17:42 +0000
+++ usr/bin/byobu-launch.in	2019-06-17 20:09:21 +0000
@@ -51,7 +51,7 @@
 			*i*)
 				# Attempt to merge shell history across sessions/windows (works with some exceptions)
 				for i in shopt setopt; do
-					if eval $BYOBU_TEST $i >/dev/null; then
+					if byobu_test $i; then
 						case $i in
 							shopt) $i -s histappend || true ;;
 							setopt) $i appendhistory || true ;;
 
=== modified file 'usr/bin/byobu-select-profile.in'
--- usr/bin/byobu-select-profile.in	2018-08-12 14:43:52 +0000
+++ usr/bin/byobu-select-profile.in	2019-06-17 20:09:21 +0000
@@ -51,47 +51,51 @@
 
 # Find a hash utility
 for i in md5sum md5 sha512sum sha256sum sha1sum shasum shasum5.12 shasum5.10; do
-	if eval $BYOBU_TEST $i >/dev/null 2>&1; then
+	if byobu_test $i; then
 		HASH="$i"
 		break
 	fi
 done
 
 usage () {
-    cat <<EOT
-Usage: $0 [OPTION]
-    -l,--list                list available profiles
+    cat <<EOF
+Usage: ${0##*/} [OPTION]
+    screen options:
+    -l,--list                list available colors
     -b,--background COLOR    set the background color
     -f,--foreground COLOR    set the foreground color
-    -h,--hostnmae            set the colors based on a hash of the hostname
+
+    tmux options:
+    -h,--hostname            set the colors based on a hash of the hostname
     -i,--ip                  set the colors based on a hash of the ip
     -r,--random              set the colors randomly
+
+    Other options:
     --help                   this help
-EOT
+
+    If multiple tmux options are specified, only the first one will
+    take effect.
+EOF
 }
 
 # Initialize variables
 FILE="$BYOBU_CONFIG_DIR/color"
-PROFILE="$BYOBU_CONFIG_DIR/profile"
-[ -r "$PROFILE" ] || ln -sf $BYOBU_PREFIX/share/$PKG/profiles/common "$PROFILE"
-selected=-1
-color=
 
-listprofiles() {
-	# Display list of profiles, one per line
+listcolors() {
+	local x
+	# Display list of colors, one per line
 	for x in $COLORS; do
 		echo "$x"
 	done
 }
 
 getletter() {
-	count=$(echo "$1" | wc -c)
-	if [ "$count" = "2" ]; then
+	local letter
+	if [ "${#1}" -eq 1 ]; then
 		echo "$1"
 		return
 	fi
-	color="$1"
-	case $color in
+	case $1 in
 		default_light) letter="d";;
 		default_dark)  letter="D";;
 		black)         letter="k";;
@@ -117,8 +121,9 @@
 }
 
 setcolor_screen() {
-	which="$1"
-	color="$2"
+	local which="$1"
+	local color="$2"
+	local FOREGROUND BACKGROUND MONOCHROME
 	[ -r $FILE ] && . $FILE
 	if [ "$which" = "foreground" ]; then
 		FOREGROUND=$(getletter "$color")
@@ -126,20 +131,20 @@
 		BACKGROUND=$(getletter "$color")
 	fi
 	[ "$MONOCHROME" = "1" ] || MONOCHROME=0
-	printf "FOREGROUND=$FOREGROUND\nBACKGROUND=$BACKGROUND\nMONOCHROME=$MONOCHROME" > $FILE
+	printf "FOREGROUND=$FOREGROUND\nBACKGROUND=$BACKGROUND\nMONOCHROME=$MONOCHROME\n" > $FILE
 	touch "$BYOBU_RUN_DIR/reload-required"
-	$BYOBU_BACKEND -X at 0 source "$BYOBU_CONFIG_DIR/profile"
+	screen -X at 0 source "$BYOBU_CONFIG_DIR/profile"
 }
 
 get_contrast() {
 	# See section 2.2: http://www.w3.org/TR/AERT#color-contrast
-	local awk="awk"
-	if eval $BYOBU_TEST gawk >/dev/null 2>&1; then
-		awk="gawk"
-	fi
 	local hex="$(echo "$1" | sed -e "s/\(..\)\(..\)\(..\)/\1 \2 \3/")"
-	local bright=$(echo $hex | $awk --non-decimal-data '{printf "%0.0f",(("0x"$1)*299+("0x"$2)*587+("0x"$3)*114)/1000}')
-	if [ $bright -ge 130 ]; then
+	local dec h
+	for h in $hex; do
+		dec="$dec $((0x$h))"
+	done
+	local bright=$(echo $dec | awk '{printf "%0.0f",(($1*299)+($2*587)+($3*114))/1000}')
+	if [ "$bright" -ge 130 ]; then
 		_RET="black"
 	else
 		_RET="white"
@@ -150,61 +155,83 @@
 	if [ "$BYOBU_BACKEND" != "tmux" ]; then
 		echo "WARNING: This functionality is only supported in Byobu with the tmux backend" 1>&2
 	fi
-	dark="$1"
+	local dark="$1"
 	get_contrast "$dark"
-	light="$_RET"
-	accent="magenta"
-	highlight="red"
-	monochrome="0"
-	printf "BYOBU_DARK=\"$dark\"\nBYOBU_LIGHT=$light\nBYOBU_ACCENT=$accent\nBYOBU_HIGHLIGHT=$highlight\nMONOCHROME=$MONOCHROME" > "$FILE".tmux
+	local light="$_RET"
+	local accent="magenta"
+	local highlight="red"
+	local monochrome="0"
+	printf "BYOBU_DARK=\"#$dark\"\nBYOBU_LIGHT=$light\nBYOBU_ACCENT=$accent\nBYOBU_HIGHLIGHT=$highlight\nMONOCHROME=$monochrome\n" > "$FILE".tmux
 	tmux source "$BYOBU_PREFIX/share/byobu/profiles/tmuxrc"
 }
 
 if [ $# -eq 0 ]; then
 	usage
-else
-	while true; do
-		case "$1" in
-			-b|--background)
-				setcolor_screen "background" "$2"
-				shift 2
-			;;
-			-f|--foreground)
-				setcolor_screen "foreground" "$2"
-				shift 2
-			;;
-			-h|--hostname)
-				color=$(hostname | $HASH | head -c 6)
-				setcolor_tmux "$color"
-				shift
-				break
-			;;
-			-i|--ip)
-				[ -r "$BYOBU_CONFIG_DIR/statusrc" ] && . "$BYOBU_CONFIG_DIR/statusrc"
-				. $BYOBU_PREFIX/lib/$PKG/ip_address
-				color=$(__ip_address t| $HASH | head -c 6)
-				setcolor_tmux "$color"
-				shift
-				break
-			;;
-			-r|--random)
-				color=$(head -c 10 /dev/urandom | $HASH | head -c 6)
-				setcolor_tmux "\#$color"
-				shift
-				break
-			;;
-			*)
-				usage
-				exit 1
-			;;
-			--)
-				shift
-				break
-			;;
-		esac
-		[ $# -eq 0 ] && break
-	done
-fi
+	exit 0
+fi
+
+# Check options first, exit early if necessary
+for opt in "$@"; do
+	if [ -n "$ignore_next" ]; then
+		ignore_next=
+		continue
+	fi
+	case $opt in
+		-l|--list) listcolors; exit 0 ;;
+		-b|--background) ignore_next=1 ;;
+		-f|--foreground) ignore_next=1 ;;
+		-h|--hostname) : ;;
+		-i|--ip) : ;;
+		-r|--random) : ;;
+		--help) usage; exit 0 ;;
+		*) usage; exit 1 ;;
+	esac
+done
+
+# Was expecting an argument but it wasn't specified
+if [ -n "$ignore_next" ]; then
+	usage
+	exit 1
+fi
+
+while [ "$#" -gt 0 ]; do
+	case $1 in
+		-b|--background)
+			setcolor_screen "background" "$2"
+			shift 2
+		;;
+		-f|--foreground)
+			setcolor_screen "foreground" "$2"
+			shift 2
+		;;
+		-h|--hostname)
+			if byobu_test hostname; then
+				h=$(hostname)
+			elif [ -r /proc/sys/kernel/hostname ]; then
+				read h < /proc/sys/kernel/hostname
+			fi
+			color=$(echo "$h" | $HASH | head -c 6)
+			setcolor_tmux "$color"
+			break
+		;;
+		-i|--ip)
+			[ -r "$BYOBU_CONFIG_DIR/statusrc" ] && . "$BYOBU_CONFIG_DIR/statusrc"
+			. $BYOBU_PREFIX/lib/$PKG/ip_address
+			color=$(__ip_address t| $HASH | head -c 6)
+			setcolor_tmux "$color"
+			break
+		;;
+		-r|--random)
+			color=$(head -c 10 /dev/urandom | $HASH | head -c 6)
+			setcolor_tmux "$color"
+			break
+		;;
+		*)
+			usage
+			exit 1
+		;;
+	esac
+done
 
 exit 0
 
 
=== modified file 'usr/bin/byobu-status-detail.in'
--- usr/bin/byobu-status-detail.in	2016-04-07 22:07:52 +0000
+++ usr/bin/byobu-status-detail.in	2019-06-17 20:09:21 +0000
@@ -22,7 +22,7 @@
 [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
 . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 
-if which vim >/dev/null && `vim --version | grep -q +folding`; then
+if byobu_test vim && vim --version | grep -q +folding; then
 	byobu-status --detail | vim -c "set foldmethod=indent" -c "set foldminlines=0" -c "set foldnestmax=1"  -c "set foldcolumn=2" -R -
 else
 	byobu-status --detail | $BYOBU_PAGER
 
=== modified file 'usr/bin/byobu-status.in'
--- usr/bin/byobu-status.in	2016-09-15 19:25:51 +0000
+++ usr/bin/byobu-status.in	2019-06-17 20:09:21 +0000
@@ -26,16 +26,15 @@
 # Make sure status is not disabled
 [ -f "$BYOBU_CONFIG_DIR/status.disable" ] && exit 0
 
-# Clean and create cache directories
-[ -d "$BYOBU_RUN_DIR/status.$BYOBU_BACKEND" ] || mkdir -p "$BYOBU_RUN_DIR/status.$BYOBU_BACKEND"
-[ -d "$BYOBU_RUN_DIR/.last.$BYOBU_BACKEND" ] || mkdir -p "$BYOBU_RUN_DIR/.last.$BYOBU_BACKEND"
+# Create cache directories
+mkdir -p "$BYOBU_RUN_DIR/status.$BYOBU_BACKEND"
+mkdir -p "$BYOBU_RUN_DIR/.last.$BYOBU_BACKEND"
 
 # Source configurations
 . "${BYOBU_PREFIX}/lib/${PKG}/include/icons"
-for i in "${BYOBU_PREFIX}/share/$PKG/status/status" "${BYOBU_PREFIX}/share/$PKG/status/statusrc" "$BYOBU_CONFIG_DIR/status" "$BYOBU_CONFIG_DIR/statusrc" "$BYOBU_CONFIG_DIR/color" "$BYOBU_CONFIG_DIR/color.tmux"; do
+for i in "${BYOBU_PREFIX}/share/$PKG/status/status" "${BYOBU_PREFIX}/share/$PKG/status/statusrc" "$BYOBU_CONFIG_DIR/status" "$BYOBU_CONFIG_DIR/statusrc" "$BYOBU_CONFIG_DIR/color" "$BYOBU_CONFIG_DIR/color.tmux" "$BYOBU_CONFIG_DIR/datetime.tmux"; do
 	[ -r "$i" ] && . "$i"
 done
-[ -r "$BYOBU_CONFIG_DIR/datetime.tmux" ] && . "$BYOBU_CONFIG_DIR/datetime.tmux"
 
 case "$BYOBU_BACKEND" in
 	screen)
@@ -153,11 +152,11 @@
 	;;
 	--detail)
 		VER=
-		if eval $BYOBU_TEST dpkg-query >/dev/null; then
+		if byobu_test dpkg-query; then
 			VER=$(set -- $(dpkg-query --show $PKG); printf "%s\n" "$2")
 		fi
 		printf "$PKG-$VER Detailed Status Navigation\n"
-		if eval $BYOBU_TEST vim >/dev/null && `vim --version | grep -q +folding`; then
+		if byobu_test vim && vim --version | grep -q +folding; then
 			printf "  Expand all - zr\t\tCollapse all - zm\n  Expand one - zo\t\tCollapse one - zc\n\n"
 		fi
 		for i in "$BYOBU_PREFIX/lib/$PKG"/*; do
 
=== modified file 'usr/bin/byobu.in'
--- usr/bin/byobu.in	2019-06-12 23:41:10 +0000
+++ usr/bin/byobu.in	2019-06-17 20:09:21 +0000
@@ -35,7 +35,11 @@
 # Source local byobu config
 if [ -r "$HOME/.byoburc" ]; then
 	# Ensure that this configuration is usable
-	. "$HOME/.byoburc" || mv -f "$HOME/.byoburc" "$HOME/.byoburc".orig
+	if sh -n "$HOME/.byoburc" >/dev/null 2>&1; then
+		. "$HOME/.byoburc"
+	else
+		mv -f "$HOME/.byoburc" "$HOME/.byoburc".orig
+	fi
 fi
 if [ -z "${BYOBU_PREFIX}" ]; then
 	# Find and export the installation location prefix
@@ -43,26 +47,22 @@
 	prefix="$(dirname $(dirname $($BYOBU_READLINK -f $0)))"
 	if [ "$prefix" != "@prefix@" ]; then
 		echo "export BYOBU_PREFIX='$prefix'" >> "$HOME/.byoburc"
-		. "$HOME/.byoburc"
+		BYOBU_PREFIX="$prefix"
 	fi
 fi
 export BYOBU_CHARMAP=$(locale charmap)
-[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
-[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
-. "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 
 # Override backend if we can determine intentions from argv[0]
-[ -r "$HOME/.$PKG/backend" ] && . "$HOME/.$PKG/backend"
 case "$0" in
 	*byobu-screen) BYOBU_BACKEND="screen" ;;
 	*byobu-tmux) BYOBU_BACKEND="tmux" ;;
 esac
 
-# At this point, we're sure BYOBU_BACKEND is properly defined
-export BYOBU_BACKEND
+[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX
+. "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 
 # Store the parent tty
-if eval $BYOBU_TEST tty >/dev/null 2>&1; then
+if byobu_test tty; then
 	export BYOBU_TTY=$(tty)
 else
 	export BYOBU_TTY=$(readlink /proc/$$/fd/0)
@@ -76,7 +76,7 @@
 	case "$1" in
 		-v|--version)
 			echo "$PKG version $VERSION"
-			if eval $BYOBU_TEST bash >/dev/null 2>&1; then
+			if byobu_test bash; then
 				# Check ulimits
 				u=$(bash -c "ulimit -n")
 				[ "$u" = "unlimited" ] || [ $u -ge 15 ] || echo "WARNING: ulimit -n is too low" 1>&2
@@ -122,7 +122,7 @@
 
 # Check if our terminfo supports 256 colors
 CAN_SHOW_COLORS=
-if eval $BYOBU_TEST tput >/dev/null 2>&1; then
+if byobu_test tput; then
 	if [ "$(tput colors 2>/dev/null || echo 0)" = "256" ]; then
 		CAN_SHOW_COLORS=1
 	fi
@@ -130,7 +130,7 @@
 
 # Check if the color terminfo is available
 HAS_COLOR_TERM=
-if eval $BYOBU_TEST infocmp >/dev/null 2>&1; then
+if byobu_test infocmp; then
 	if infocmp "$BYOBU_COLOR_TERM" >/dev/null 2>&1; then
 		HAS_COLOR_TERM=1
 	fi
@@ -151,7 +151,7 @@
 		fi
 		BYOBU_PROFILE="-f $BYOBU_PREFIX/share/$PKG/profiles/tmuxrc"
 		# Set default window, unless user has overriden
-		if egrep -qs "default-command|default-shell" $HOME/.$PKG/.tmux.conf >/dev/null 2>&1; then
+		if egrep -qs "default-command|default-shell" "$BYOBU_CONFIG_DIR/.tmux.conf" >/dev/null 2>&1; then
 			DEFAULT_WINDOW=
 		else
 			DEFAULT_WINDOW="new-session -n $BYOBU_WINDOW_NAME ${BYOBU_PREFIX}/bin/byobu-shell"
@@ -191,13 +191,7 @@
 			fi
 		fi
 		SCREEN_TERM="-T $BYOBU_TERM"
-		# Some users want to maintain separate configurations
-		# if they use both GNU Screen and byobu on the same system
-		if [ -r "$BYOBU_CONFIG_DIR/.screenrc" ]; then
-			BYOBU_PROFILE="-c $BYOBU_PREFIX/share/$PKG/profiles/byoburc"
-		else
-			BYOBU_PROFILE="-c $BYOBU_PREFIX/share/$PKG/profiles/screenrc"
-		fi
+		BYOBU_PROFILE="-c $BYOBU_PREFIX/share/$PKG/profiles/screenrc"
 		BYOBU_SESSION_NAME="-S $PKG"
 		# Zero out $BYOBU_SESSION_NAME if user has specified a session name
 		for i in "$@"; do
 
=== modified file 'usr/lib/byobu/battery'
--- usr/lib/byobu/battery	2016-09-15 19:25:51 +0000
+++ usr/lib/byobu/battery	2019-06-17 20:09:21 +0000
@@ -77,7 +77,7 @@
 		esac
 	done
 	# Mac OS X support
-	if eval $BYOBU_TEST /usr/sbin/ioreg >/dev/null 2>&1; then
+	if byobu_test /usr/sbin/ioreg; then
 		# MacOS support
 		local key
 		for key in CurrentCapacity MaxCapacity ExternalChargeCapable FullyCharged; do
 
=== modified file 'usr/lib/byobu/disk_io'
--- usr/lib/byobu/disk_io	2019-06-12 00:01:41 +0000
+++ usr/lib/byobu/disk_io	2019-06-17 20:09:21 +0000
@@ -20,7 +20,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 __disk_io_detail() {
-	if eval $BYOBU_TEST iostat >/dev/null; then
+	if byobu_test iostat; then
 		iostat -d -m -h
 	else
 		printf "%s\n" "Please install iostat if you want detailed information on your disk throughput"
 
=== modified file 'usr/lib/byobu/hostname'
--- usr/lib/byobu/hostname	2019-05-26 19:12:44 +0000
+++ usr/lib/byobu/hostname	2019-06-17 20:09:21 +0000
@@ -25,7 +25,7 @@
 
 __hostname() {
 	local h=
-	if eval $BYOBU_TEST hostname >/dev/null 2>&1; then
+	if byobu_test hostname; then
 		h=$(hostname -s 2>/dev/null || hostname)
 	elif [ -r /proc/sys/kernel/hostname ]; then
 		read h < /proc/sys/kernel/hostname
 
=== modified file 'usr/lib/byobu/include/common'
--- usr/lib/byobu/include/common	2016-09-15 19:25:51 +0000
+++ usr/lib/byobu/include/common	2019-06-17 20:09:21 +0000
@@ -27,6 +27,10 @@
 		eval $BYOBU_TEST ls >/dev/null 2>&1 && break || true
 	done
 
+	byobu_test() {
+		eval $BYOBU_TEST "$1" >/dev/null 2>&1
+	}
+
 	# If the backend is already set (eg. running `byobu-tmux`), do nothing.
 	if [ -z "${BYOBU_BACKEND}" ]; then
 		[ -r "/etc/$PKG/backend" ] && . "/etc/$PKG/backend"
@@ -34,9 +38,9 @@
 		# Just in case there's no config file at all
 		if [ -z "${BYOBU_BACKEND}" ]; then
 			# New byobu configuration, default to tmux
-			if eval $BYOBU_TEST tmux >/dev/null; then
+			if byobu_test tmux; then
 				BYOBU_BACKEND="tmux"
-			elif eval $BYOBU_TEST screen >/dev/null; then
+			elif byobu_test screen; then
 				BYOBU_BACKEND="screen"
 			else
 				printf "%s\n" "ERROR: $PKG won't work without tmux or screen installed" 1>&2
@@ -45,7 +49,7 @@
   	fi
 
 	# Creating backend cache
-	[ -d "$BYOBU_RUN_DIR/cache.$BYOBU_BACKEND" ] || mkdir -p "$BYOBU_RUN_DIR/cache.$BYOBU_BACKEND"
+	mkdir -p "$BYOBU_RUN_DIR/cache.$BYOBU_BACKEND"
 
 	. "${BYOBU_PREFIX}/lib/${PKG}/include/shutil"
 	. "${BYOBU_PREFIX}/lib/${PKG}/include/constants"
 
=== modified file 'usr/lib/byobu/include/constants'
--- usr/lib/byobu/include/constants	2018-04-11 15:16:45 +0000
+++ usr/lib/byobu/include/constants	2019-06-17 20:09:21 +0000
@@ -26,10 +26,6 @@
 PCT="%"
 
 # Support two different backends (screen/tmux)
-if [ -z "$BYOBU_BACKEND" ]; then
-	[ -r "/etc/byobu/backend" ] && . "/etc/byobu/backend"
-	[ -r "$BYOBU_CONFIG_DIR/backend" ] && . "$BYOBU_CONFIG_DIR/backend"
-fi
 case "$BYOBU_BACKEND" in
 	tmux)
 		export BYOBU_BACKEND
@@ -44,18 +40,18 @@
 esac
 
 # MacOS Support
-eval $BYOBU_TEST gsed >/dev/null 2>&1 && export BYOBU_SED="gsed" || export BYOBU_SED="sed"
-eval $BYOBU_TEST greadlink >/dev/null 2>&1 && export BYOBU_READLINK="greadlink" || export BYOBU_READLINK="readlink"
-eval $BYOBU_TEST sensible-pager >/dev/null 2>&1 && export BYOBU_PAGER="sensible-pager" || export BYOBU_PAGER="less"
-eval $BYOBU_TEST sensible-editor >/dev/null 2>&1 && export BYOBU_EDITOR="sensible-editor" || export BYOBU_EDITOR="$EDITOR"
-eval $BYOBU_TEST "$BYOBU_EDITOR" >/dev/null 2>&1 || export BYOBU_EDITOR="vim"
+byobu_test gsed && export BYOBU_SED="gsed" || export BYOBU_SED="sed"
+byobu_test greadlink && export BYOBU_READLINK="greadlink" || export BYOBU_READLINK="readlink"
+byobu_test sensible-pager && export BYOBU_PAGER="sensible-pager" || export BYOBU_PAGER="less"
+byobu_test sensible-editor && export BYOBU_EDITOR="sensible-editor" || export BYOBU_EDITOR="$EDITOR"
+byobu_test "$BYOBU_EDITOR" || export BYOBU_EDITOR="vim"
 
 
 # Check sed's follow-symlinks feature
 $BYOBU_SED --follow-symlinks "s///" /dev/null 2>/dev/null && BYOBU_SED_INLINE="$BYOBU_SED -i --follow-symlinks" || BYOBU_SED_INLINE="$BYOBU_SED -i"
 
 # Determine if we have ulimit support
-eval $BYOBU_TEST ulimit >/dev/null 2>&1 && export BYOBU_ULIMIT="ulimit" || export BYOBU_ULIMIT="false"
+byobu_test ulimit && export BYOBU_ULIMIT="ulimit" || export BYOBU_ULIMIT="false"
 
 # Find a suitable python interpreter, if undefined
 if [ -z "$BYOBU_PYTHON" ]; then
 
=== modified file 'usr/lib/byobu/include/dirs.in'
--- usr/lib/byobu/include/dirs.in	2016-04-07 22:07:52 +0000
+++ usr/lib/byobu/include/dirs.in	2019-06-17 20:09:21 +0000
@@ -25,22 +25,29 @@
 [ -n "$BYOBU_PREFIX" ] || BYOBU_PREFIX="@prefix@"
 
 # Create and export the user configuration directory
-if [ -d "$BYOBU_CONFIG_DIR" ]; then
-	export BYOBU_CONFIG_DIR="$BYOBU_CONFIG_DIR"
-elif [ -d "$XDG_CONFIG_HOME" ]; then
-	# Use XDG, as some users insist on such nonsense :-)
-	export BYOBU_CONFIG_DIR="$XDG_CONFIG_HOME/$PKG"
+if [ -n "$BYOBU_CONFIG_DIR" ]; then
+	# Explicitly told to use this location, even if it does not exist yet
+	:
+elif [ -n "$XDG_CONFIG_HOME" ]; then
+	# Presumably set explicitly, use even if it doesn't exist yet
+	BYOBU_CONFIG_DIR="$XDG_CONFIG_HOME/$PKG"
 elif [ -d "$HOME/.config/$PKG" ]; then
 	# Use XDG config directory, if it exists
-	export BYOBU_CONFIG_DIR="$HOME/.config/$PKG"
+	BYOBU_CONFIG_DIR="$HOME/.config/$PKG"
 elif [ -d "$HOME/.local/share/$PKG" ]; then
 	# Use XDG local directory, if it exists
-	export BYOBU_CONFIG_DIR="$HOME/.local/share/$PKG"
+	BYOBU_CONFIG_DIR="$HOME/.local/share/$PKG"
+elif [ -d "$HOME/.$PKG" ]; then
+	# Use classic config dir location, if it exists
+	BYOBU_CONFIG_DIR="$HOME/.$PKG"
+elif [ -d "$HOME/.config" ]; then
+	# Create new config in XDG config directory
+	BYOBU_CONFIG_DIR="$HOME/.config/$PKG"
 else
 	# And to default to good old classic config dir location!
-	export BYOBU_CONFIG_DIR="$HOME/.$PKG"
+	BYOBU_CONFIG_DIR="$HOME/.$PKG"
 fi
-[ -d "$BYOBU_CONFIG_DIR" ] || mkdir -p "$BYOBU_CONFIG_DIR/bin"
+mkdir -p "$BYOBU_CONFIG_DIR/bin"
 
 # Grab the global, then local socket directory
 [ -r "/etc/$PKG/socketdir" ] && . "/etc/$PKG/socketdir"
@@ -51,22 +58,24 @@
 	# Use shm for performance, if possible
 	for i in /dev/shm/$PKG-$USER-*; do
 		if [ -d "$i" ] && [ -O "$i" ]; then
-			export BYOBU_RUN_DIR="$i"
+			BYOBU_RUN_DIR="$i"
 			break
 		fi
 	done
 	# Still empty, make a new one
 	if [ ! -d "$BYOBU_RUN_DIR" ] || [ ! -O "$BYOBU_RUN_DIR" ]; then
-		export BYOBU_RUN_DIR=$(mktemp -d /dev/shm/$PKG-$USER-XXXXXXXX)
+		BYOBU_RUN_DIR=$(mktemp -d /dev/shm/$PKG-$USER-XXXXXXXX)
 	fi
 fi
 if [ ! -d "$BYOBU_RUN_DIR" ] || [ ! -O "$BYOBU_RUN_DIR" ] || [ ! -w "$BYOBU_RUN_DIR" ]; then
 	# For distros that don't have a /dev/shm, use local disk
-	if [ -d "$XDG_CACHE_HOME" ]; then
+	if [ -n "$XDG_CACHE_HOME" ]; then
 		# Use XDG, as some users insist on such nonsense :-)
-		export BYOBU_RUN_DIR="$XDG_CACHE_HOME/$PKG"
+		BYOBU_RUN_DIR="$XDG_CACHE_HOME/$PKG"
 	else
 		# But if not, we'll use a cache directory
-		export BYOBU_RUN_DIR="$HOME/.cache/$PKG"
+		BYOBU_RUN_DIR="$HOME/.cache/$PKG"
 	fi
 fi
+
+export BYOBU_CONFIG_DIR BYOBU_RUN_DIR
 
=== modified file 'usr/lib/byobu/include/shutil'
--- usr/lib/byobu/include/shutil	2018-08-12 16:28:39 +0000
+++ usr/lib/byobu/include/shutil	2019-06-17 20:09:21 +0000
@@ -300,7 +300,7 @@
 			[ "$Mask" = "00000000" ] && break
 		done < /proc/net/route
 		_RET="$Iface"
-	elif eval $BYOBU_TEST route >/dev/null 2>&1; then
+	elif byobu_test route; then
 		# Route command on path
 		_RET=$(route get default|grep interface:|awk '{print $2}')
 	elif [ -x "/sbin/route" ]; then
@@ -340,7 +340,7 @@
 				distro="${issue%% *}";
 			;;
 		esac
-	elif eval $BYOBU_TEST lsb_release >/dev/null 2>&1; then
+	elif byobu_test lsb_release; then
 		# If lsb_release is available, use it
 		local r=$(lsb_release -s -d)
 		case "$r" in
@@ -354,9 +354,9 @@
 				distro=$(lsb_release -s -i)
 			;;
 		esac
-	elif eval $BYOBU_TEST sw_vers >/dev/null 2>&1; then
+	elif byobu_test sw_vers; then
 		distro="$(sw_vers -productName)"
-	elif eval $BYOBU_TEST uname >/dev/null 2>&1; then
+	elif byobu_test uname; then
 		distro="$(uname -s)"
 	else
 		distro="Byobu"
 
=== modified file 'usr/lib/byobu/ip_address'
--- usr/lib/byobu/ip_address	2018-08-12 14:07:40 +0000
+++ usr/lib/byobu/ip_address	2019-06-17 20:09:21 +0000
@@ -47,7 +47,7 @@
 				# Background an update
 				if [ -x /sbin/ip ]; then
 					LC_ALL=C /sbin/ip -6 addr list dev "$interface" scope global </dev/null >"$cache" 2>/dev/null &
-				elif eval $BYOBU_TEST ifconfig >/dev/null 2>&1; then
+				elif byobu_test ifconfig; then
 					LC_ALL=c ifconfig "$interface" | grep "inet6 " | awk '{print $2}' | sed -e "s/%.*//" >"$cache" 2>/dev/null &
 
 				fi
@@ -73,7 +73,7 @@
 					ipaddr=$(LC_ALL=C /sbin/ip -4 addr list dev "$interface" scope global 2>/dev/null)
 					ipaddr=${ipaddr#* inet }
 					ipaddr=${ipaddr%%/*}
-				elif eval $BYOBU_TEST ifconfig >/dev/null 2>&1; then
+				elif byobu_test ifconfig; then
 					ipaddr=$(ifconfig "$interface" | grep "inet " | awk '{print $2}')
 				fi
 			fi
 
=== modified file 'usr/lib/byobu/memory'
--- usr/lib/byobu/memory	2016-09-15 19:25:51 +0000
+++ usr/lib/byobu/memory	2019-06-17 20:09:21 +0000
@@ -36,7 +36,7 @@
 			esac
 			[ -n "${free}" -a -n "${total}" -a -n "${buffers}" -a -n "${cached}" ] && break;
 		done < /proc/meminfo
-	elif eval $BYOBU_TEST vm_stat >/dev/null 2>&1; then
+	elif byobu_test vm_stat; then
 		# MacOS support
 		# calculation borrowed from http://apple.stackexchange.com/a/48195/18857
 		free_blocks=$(vm_stat | grep free | awk '{ print $3 }' | sed -e 's/\.//')
 
=== modified file 'usr/lib/byobu/release'
--- usr/lib/byobu/release	2019-05-26 19:14:28 +0000
+++ usr/lib/byobu/release	2019-06-17 20:09:21 +0000
@@ -46,10 +46,10 @@
 				RELEASE="$ver"
 			;;
 		esac
-	elif eval $BYOBU_TEST sw_vers >/dev/null 2>&1; then
+	elif byobu_test sw_vers; then
 		RELEASE="$(sw_vers -productVersion)"
 	fi
-	if [ -z "$RELEASE" ] && eval $BYOBU_TEST lsb_release >/dev/null 2>&1; then
+	if [ -z "$RELEASE" ] && byobu_test lsb_release; then
 		# If lsb_release is available, use it
 		RELEASE=$(lsb_release -s -r)
 	fi
 
=== modified file 'usr/lib/byobu/updates_available'
--- usr/lib/byobu/updates_available	2019-05-26 19:15:34 +0000
+++ usr/lib/byobu/updates_available	2019-06-17 20:09:21 +0000
@@ -51,32 +51,32 @@
 	if [ -x /usr/lib/update-notifier/apt-check ]; then
 		# If apt-check binary exists, use it
 		flock -xn "$flock" sh -c "(/usr/lib/update-notifier/apt-check 2>&1 | awk '-F;' 'END { print \$1, \$2 }' >\"${mycache}-x\" 2>/dev/null ; mv \"${mycache}-x\" \"$mycache\")" &
-	elif eval $BYOBU_TEST apt-get >/dev/null; then
+	elif byobu_test apt-get; then
 		# If apt-get exists, use it
 		flock -xn "$flock" apt-get -s -o Debug::NoLocking=true upgrade | grep -c ^Inst >$mycache 2>/dev/null &
-	elif eval $BYOBU_TEST pkcon >/dev/null; then
+	elif byobu_test pkcon; then
 		# use packagekit to show list of packages
 		LC_ALL=C flock -xn "$flock" pkcon get-updates -p | awk '/^Results:$/ { start=NR }; /^Security/ { security++ }; END { if (!/There are no updates available at this time./) { print NR-start, security }}' > "$mycache" 2>/dev/null &
-	elif eval $BYOBU_TEST zypper >/dev/null; then
+	elif byobu_test zypper; then
 		# If zypper exists, use it
 		flock -xn "$flock" zypper --no-refresh lu --best-effort | grep -c 'v |' >$mycache 2>/dev/null &
-	elif eval $BYOBU_TEST yum >/dev/null; then
+	elif byobu_test yum; then
 		# If yum exists, use it
 		# TODO: We need a better way of counting updates available from a RH expert
 		flock -xn "$flock" yum list updates -q | grep -vc "Updated Packages" >$mycache 2>/dev/null &
-	elif eval $BYOBU_TEST pacman >/dev/null; then
+	elif byobu_test pacman; then
 		# If pacman (Archlinux) exists, use it
 		LC_ALL=C flock -xn "$flock" pacman -Sup | grep -vc "^\(::\| \)" >$mycache 2>/dev/null &
-	elif eval $BYOBU_TEST opkg >/dev/null; then
+	elif byobu_test opkg; then
 		# If opkg (OpenWrt) exists, use it, also background if flock exists
-		if eval $BYOBU_TEST flock >/dev/null; then
+		if byobu_test flock; then
 			flock -xn "$flock" opkg list-upgradable | wc -l >$mycache 2>/dev/null &
 		else
 			opkg list-upgradable | wc -l >$mycache &
 		fi
-	elif eval $BYOBU_TEST brew >/dev/null; then
+	elif byobu_test brew; then
 		# If homebrew (Mac OSX) exists, use it, also background if flock exists
-		if eval $BYOBU_TEST flock >/dev/null; then
+		if byobu_test flock; then
 			flock -xn "$flock" brew outdated | wc -l >$mycache 2>/dev/null &
 		else
 			brew outdated | wc -l >$mycache &
@@ -90,7 +90,7 @@
 	local mycache=$1
 	# The cache doesn't exist: create it
 	[ ! -e "$mycache" ] && return 0
-	if eval $BYOBU_TEST apt-get >/dev/null; then
+	if byobu_test apt-get; then
 		# Debian/ubuntu
 		d0=$(($(stat -c %Y $mycache 2>/dev/null)-5))
 		d1=$(stat -c %Y /var/lib/apt)
@@ -106,14 +106,14 @@
 	elif [ -e "/var/lib/PackageKit/transactions.db" ]; then
 		[ "/var/lib/PackageKit/transactions.db" -nt "$mycache" ]
 		return $?
-	elif eval $BYOBU_TEST pacman >/dev/null; then
+	elif byobu_test pacman; then
 		# Archlinux
 		local db
 		for db in /var/lib/pacman/sync/*.db; do
 			[ "$db" -nt "$mycache" ] && return 0
 		done
 		return 1
-	elif eval $BYOBU_TEST opkg >/dev/null; then
+	elif byobu_test opkg; then
 		# OpenWrt
 		[ ! -e /var/lock/opkg.lock ] || return 1
 		if [ -d /var/opkg-lists ]; then
@@ -125,7 +125,7 @@
 			[ "$u" -gt 0 ]
 			return $?
 		fi
-	elif eval $BYOBU_TEST brew >/dev/null; then
+	elif byobu_test brew; then
 		# Mac OSX
 		# check if any new versions have been installed since
 		# we last cached. this may not recognize formulae
@@ -142,7 +142,7 @@
 }
 
 __updates_available_detail() {
-	if eval $BYOBU_TEST apt-get >/dev/null; then
+	if byobu_test apt-get; then
 		local detail=`apt-get -s -o Debug::NoLocking=true upgrade`
 		if [ "$1" = "--detail" ]; then
 			printf "$detail"
 
=== modified file 'usr/lib/byobu/users'
--- usr/lib/byobu/users	2019-05-26 19:18:32 +0000
+++ usr/lib/byobu/users	2019-06-17 20:09:21 +0000
@@ -26,7 +26,7 @@
 }
 
 __users() {
-	local count=0
+	local count=0 sign
 	if [ "$USERS_DISTINCT" = "1" ]; then
 		count=$(pgrep -fl 'sshd:.*@' | cut -f3 -d\ | cut -f1 -d@ | sort -u | wc -l)
 	else
@@ -35,7 +35,15 @@
 		count=$(pgrep -f "^sshd:.*@|^/usr/sbin/sshd -i" | wc -l) || return
 	fi
 	if [ $count -gt 0 ]; then
-		color b w r; printf "%d" "$count"; color -; color w r; printf "##"; color --
+		case "$BYOBU_BACKEND" in
+			tmux)
+				sign="##"
+			;;
+			screen)
+				sign="#"
+			;;
+		esac
+		color b w r; printf "%d" "$count"; color -; color w r; printf "$sign"; color --
 	else
 		rm -f "$BYOBU_RUN_DIR/status.$BYOBU_BACKEND/users"*
 	fi
 
=== modified file 'usr/lib/byobu/whoami'
--- usr/lib/byobu/whoami	2019-05-26 19:15:56 +0000
+++ usr/lib/byobu/whoami	2019-06-17 20:09:21 +0000
@@ -20,9 +20,9 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 ___get_user() {
-	if eval $BYOBU_TEST whoami >/dev/null 2>&1; then
+	if byobu_test whoami; then
 		whoami
-	elif eval $BYOBU_TEST id >/dev/null 2>&1; then
+	elif byobu_test id; then
 		id -un
 	fi
 }
@@ -30,7 +30,7 @@
 __whoami_detail() {
 	local user=$(___get_user)
 	[ -n "$user" ] || return
-	if eval $BYOBU_TEST getent >/dev/null 2>&1; then
+	if byobu_test getent; then
 		getent -- passwd "$user"
 	else
 		grep "^$user:" /etc/passwd
 
=== modified file 'usr/lib/byobu/wifi_quality'
--- usr/lib/byobu/wifi_quality	2019-06-01 21:12:18 +0000
+++ usr/lib/byobu/wifi_quality	2019-06-17 20:09:21 +0000
@@ -28,21 +28,21 @@
 }
 
 __wifi_quality_detail() {
-	if eval $BYOBU_TEST iw >/dev/null 2>&1; then
+	if byobu_test iw; then
 		local dev
 		for dev in $(___get_dev_list); do
 			iw dev "$dev" info
 			iw dev "$dev" link
 			echo
 		done
-	elif eval $BYOBU_TEST iwconfig >/dev/null 2>&1; then
+	elif byobu_test iwconfig; then
 		iwconfig 2>/dev/null
 	fi
 }
 
 __wifi_quality() {
 	local out bitrate quality
-	if eval $BYOBU_TEST iwconfig >/dev/null 2>&1; then
+	if byobu_test iwconfig; then
 		# iwconfig is expected to output lines like:
 		#    Bit Rate=54 Mb/s   Tx-Power=15 dBm
 		#    Link Quality=60/70  Signal level=-50 dBm
@@ -54,7 +54,7 @@
 			    $0 ~ /[ ]*Bit Rate/ { sub(/.*[:=]/,"",$2); printf("bitrate=%s\n", $2); }
 			    '`
 		eval "$out"
-	elif eval $BYOBU_TEST iw >/dev/null 2>&1; then
+	elif byobu_test iw; then
 		local dev
 		for dev in $(___get_dev_list); do
 			# iw is expected to output lines like:
 
=== modified file 'usr/share/byobu/keybindings/f-keys.screen'
--- usr/share/byobu/keybindings/f-keys.screen	2018-04-11 15:16:45 +0000
+++ usr/share/byobu/keybindings/f-keys.screen	2019-06-17 20:09:21 +0000
@@ -89,4 +89,4 @@
 register d ":source $BYOBU_PREFIX/share/byobu/keybindings/f-keys.screen.disable^M"
 bind ! eval 'process x' 'process d' 'backtick 111 9999999 9999999 byobu-status menu --disable-f-keys'	# F12 ! | toggle on/off f-keys
 
-bindkey "^A" $BYOBU_BACKEND -t ctrl-a byobu-ctrl-a
+bindkey "^A" $BYOBU_BACKEND -t ctrl-a byobu-ctrl-a autorun
 
=== modified file 'usr/share/byobu/keybindings/f-keys.tmux'
--- usr/share/byobu/keybindings/f-keys.tmux	2019-05-26 19:10:55 +0000
+++ usr/share/byobu/keybindings/f-keys.tmux	2019-06-17 20:09:21 +0000
@@ -82,4 +82,4 @@
 bind-key -n M-F12 source $BYOBU_PREFIX/share/byobu/keybindings/mouse.tmux.enable
 bind-key -n M-IC paste-buffer
 
-bind-key -n C-a new-window -n "ctrl-a" "byobu-ctrl-a"
+bind-key -n C-a new-window -n "ctrl-a" "byobu-ctrl-a autorun"
 
=== modified file 'usr/share/byobu/profiles/Makefile.am'
--- usr/share/byobu/profiles/Makefile.am	2015-11-14 22:57:11 +0000
+++ usr/share/byobu/profiles/Makefile.am	2019-06-17 20:09:21 +0000
@@ -1,2 +1,2 @@
 profilesdir = $(datadir)/@PACKAGE@/profiles
-profiles_DATA = bashrc byoburc dircolors screenrc common tmux tmuxrc NONE
+profiles_DATA = bashrc dircolors screenrc common tmux tmuxrc NONE
 
=== removed file 'usr/share/byobu/profiles/byoburc'
--- usr/share/byobu/profiles/byoburc	2016-04-07 22:07:52 +0000
+++ usr/share/byobu/profiles/byoburc	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-###############################################################################
-#    Load:
-#     * the stock byobu profile
-#     * any windows
-#     * and the local byoburc (instead of .screenrc)
-#    Used at startup but not profile refresh
-#
-#    Copyright (C) 2009-2011 Canonical Ltd.
-#
-#    Authors: Dustin Kirkland <[e-mail]>
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, version 3 of the License.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-###############################################################################
-
-source $BYOBU_CONFIG_DIR/profile
-source $BYOBU_WINDOWS
-source $BYOBU_CONFIG_DIR/.screenrc
 
=== modified file 'usr/share/byobu/profiles/screenrc'
--- usr/share/byobu/profiles/screenrc	2016-04-07 22:07:52 +0000
+++ usr/share/byobu/profiles/screenrc	2019-06-17 20:09:21 +0000
@@ -2,7 +2,7 @@
 #    Load:
 #     * the stock byobu profile
 #     * any windows
-#     * and the local .screenrc (instead of .byoburc)
+#     * and the local .screenrc
 #    Used at startup but not profile refresh
 #
 #    Copyright (C) 2009-2011 Canonical Ltd.
 
=== modified file 'usr/share/byobu/profiles/tmuxrc'
--- usr/share/byobu/profiles/tmuxrc	2016-04-07 22:07:52 +0000
+++ usr/share/byobu/profiles/tmuxrc	2019-06-17 20:09:21 +0000
@@ -2,7 +2,7 @@
 #    Load:
 #     * the stock byobu profile
 #     * any windows
-#     * and the local byoburc (instead of .screenrc)
+#     * and the local .tmux.conf
 #    Used at startup but not profile refresh
 #
 #    Copyright (C) 2009-2011 Canonical Ltd.