From 4351008d973bee2ea67d16614336a2dd6c5b6a74 Mon Sep 17 00:00:00 2001
From: Dustin Kirkland <kirkland@ubuntu.com>
Date: Wed, 11 Oct 2017 17:09:08 -0400
Subject: [PATCH] * usr/bin/wifi-status:   - add a speedometer split *
 debian/control, usr/bin/wifi-status,   usr/share/byobu/profiles/bashrc:   -
 kill the double bracket;  doesn't always print nicely

---
 debian/changelog                |  6 +++++-
 debian/control                  |  1 +
 usr/bin/wifi-status             |  2 ++
 usr/share/byobu/profiles/bashrc | 11 -----------
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2c10c463..d4661aa7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
 byobu (5.124) unreleased; urgency=medium
 
-  * UNRELEASED
+  * usr/bin/wifi-status:
+    - add a speedometer split
+  * debian/control, usr/bin/wifi-status,
+    usr/share/byobu/profiles/bashrc:
+    - kill the double bracket;  doesn't always print nicely
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Mon, 25 Sep 2017 10:28:42 -0500
 
diff --git a/debian/control b/debian/control
index 5b9d101c..f066ca2d 100644
--- a/debian/control
+++ b/debian/control
@@ -30,6 +30,7 @@ Suggests:
  lsb-release,
  po-debconf,
  screen,
+ speedometer,
  ttf-ubuntu-font-family (>= 0.80-0ubuntu1~medium),
  update-notifier-common,
  vim,
diff --git a/usr/bin/wifi-status b/usr/bin/wifi-status
index 98c98280..1998a2e7 100755
--- a/usr/bin/wifi-status
+++ b/usr/bin/wifi-status
@@ -32,12 +32,14 @@ router=$(ip route show|head -n 1|awk '{print $3}')
 if [ -z "$TMUX" ]; then
 	watch -n1 "iw $dev info; ip addr show $dev; ip route; echo; (journalctl -b --no-pager -q | grep -i $dev | tail -n 10 | sort -r); echo; ping -I $dev -c 1 8.8.8.8"
 else
+	# Note that the speedometer item will silently fail, if the speedometer command is not found;  I don't want byobu to depend on speedometer, but it can suggest it
 	tmux new-window -n wifi-status "watch -c iw $dev info \| ccze -A" \; \
 		split-window -t wifi-status -v "watch -c ip addr show $dev \| ccze -A" \; \
 		split-window -t wifi-status -v "watch -c ip route \| ccze -A" \; \
 		split-window -t wifi-status -h "ping -I $dev $router" \; \
 		split-window -t wifi-status -v "watch -c journalctl -b --no-pager -q \| grep -i $dev \| tail -n 10 \| sort -r \| ccze -A" \; \
 		split-window -t wifi-status -h "ping -I $dev 8.8.8.8" \; \
+		split-window -t wifi-status -v "speedometer -t $dev -r $dev" \; \
 		select-layout -t wifi-status tiled
 fi
 
diff --git a/usr/share/byobu/profiles/bashrc b/usr/share/byobu/profiles/bashrc
index 7cec1e3a..04404c2e 100644
--- a/usr/share/byobu/profiles/bashrc
+++ b/usr/share/byobu/profiles/bashrc
@@ -30,17 +30,6 @@ if [ -n "$TMUX" ] || [ "${TERMCAP#*screen}" != "${TERMCAP}" ]; then
 		byobu_prompt_symbol() {
 			if [ "$USER" = "root" ]; then
 				printf "%s" "#";
-			elif [ "$BYOBU_DISTRO" = "Ubuntu" ]; then
-				case "$BYOBU_CHARMAP" in
-					"UTF-8")
-						# MATHEMATICAL RIGHT DOUBLE ANGLE BRACKET (U+27EB, Pe): ⟫
-						printf "%s" "⟫"
-					;;
-					*)
-						# Simple ASCII greater-than sign
-						printf "%s" ">"
-					;;
-				esac
 			else
 				printf "%s" "\$"
 			fi