From 6b13802d710568a21e2754816fe09255b14fbd94 Mon Sep 17 00:00:00 2001
From: Dustin Kirkland <dustin.kirkland@gmail.com>
Date: Tue, 8 Jan 2013 16:23:11 -0600
Subject: [PATCH] * usr/lib/byobu/distro, usr/lib/byobu/logo: LP: #1094716   -
 try to improve logo printing and distro detection on Mac

---
 debian/changelog     |  2 ++
 usr/lib/byobu/distro |  2 ++
 usr/lib/byobu/logo   | 10 ++++++----
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 80a18b97..81926cce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,8 @@ byobu (5.23) unreleased; urgency=low
     debian/install, usr/share/byobu/pixmaps/highcontrast/byobu.svg:
     - add a byobu high contrast icon, LP: #1082241
     - simplify, removing detail
+  * usr/lib/byobu/distro, usr/lib/byobu/logo: LP: #1094716
+    - try to improve logo printing and distro detection on Mac
 
   [ Dustin Kirkland and Philip Muškovac ]
   * usr/lib/byobu/battery: LP: #1090831
diff --git a/usr/lib/byobu/distro b/usr/lib/byobu/distro
index bbb8992d..6a09639d 100755
--- a/usr/lib/byobu/distro
+++ b/usr/lib/byobu/distro
@@ -58,6 +58,8 @@ __distro() {
 				DISTRO=$(lsb_release -s -i)
 			;;
 		esac
+	elif $BYOBU_TEST uname >/dev/null 2>&1; then
+		DISTRO="$(uname -s)"
 	else
 		DISTRO="Byobu"
 	fi
diff --git a/usr/lib/byobu/logo b/usr/lib/byobu/logo
index 69188165..efdb7da7 100755
--- a/usr/lib/byobu/logo
+++ b/usr/lib/byobu/logo
@@ -33,6 +33,8 @@ get_distro() {
 		_RET=`lsb_release -s -a 2>/dev/null`
 	elif $BYOBU_TEST sw_vers >/dev/null 2>&1; then
 		_RET=`sw_vers 2>/dev/null`
+	elif $BYOBU_TEST uname >/dev/null 2>&1; then
+		_RET=`uname -s`
 	else
 		# No idea!
 		_RET="[B]"
@@ -66,7 +68,7 @@ __logo() {
 					color m W; printf " U "; color -
 				fi
 			else
-				printf "\\o/"
+				printf " U "
 			fi
 		;;
 		*altlinux*)
@@ -97,13 +99,13 @@ __logo() {
 			logo=" > "
 			$MARKUP && printf "$(color b c w)%s$(color -)" "$logo" || printf "$logo"
 		;;
-		*mac*)
+		*mac*|*darwin*)
 			if [ "$BYOBU_BACKEND" = "tmux" ] && [ "$BYOBU_CHARMAP" = "UTF-8" ]; then
-			logo=" ⌘  "
+				logo=" ⌘  "
 			else
 				logo=" X "
 			fi
-			$MARKUP && printf "$(color b k w)%s$(color -)" "$logo" || printf "$logo"
+			$MARKUP && printf "$(color w k)%s$(color -)" "$logo" || printf "$logo"
 		;;
 		*mandriva*)
 			logo=" (* "