Merge lp:~jefferyto/byobu/fix-trailing-hash into lp:byobu

[Jeffery To]

To show a literal '#', tmux needs two '#' characters while screen needs only one.

Unmerged revisions

2644. By Jeffery To on 2020-02-18

* usr/lib/byobu/users:
  - Fix trailing '#' sign for screen

=== modified file 'debian/changelog'
--- debian/changelog	2020-02-17 14:15:05 +0000
+++ debian/changelog	2020-02-18 20:36:39 +0000
@@ -2,6 +2,10 @@
 
   * UNRELEASED
 
+  [ Jeffery To ]
+  * usr/lib/byobu/users:
+    - Fix trailing '#' sign for screen
+
  -- Dustin Kirkland <[e-mail]>  Mon, 17 Feb 2020 08:15:04 -0600
 
 byobu (5.133-0ubuntu1) focal; urgency=medium
 
=== modified file 'usr/lib/byobu/users'
--- usr/lib/byobu/users	2019-05-26 19:18:32 +0000
+++ usr/lib/byobu/users	2020-02-18 20:36:39 +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