From abbabf9a305de06ffa1e8bbc28020153ddb563e6 Mon Sep 17 00:00:00 2001
From: Dustin Kirkland <kirkland@canonical.com>
Date: Mon, 8 Jun 2009 12:10:18 -0500
Subject: [PATCH] +  * bin/logo: use a case-statement instead of nasty
 if/then/else stack

Signed-off-by: Dustin Kirkland <kirkland@canonical.com>
---
 bin/logo         | 99 ++++++++++++++++++++++++++++--------------------
 debian/changelog |  3 +-
 2 files changed, 59 insertions(+), 43 deletions(-)

diff --git a/bin/logo b/bin/logo
index 3740a2e6..8f92d2b6 100755
--- a/bin/logo
+++ b/bin/logo
@@ -27,48 +27,63 @@ else
 fi
 
 print_logo() {
-	distro="$1"
-	if echo "$distro" | grep -qsi "ubuntu"; then
-		$MARKUP && printf "\005{=b kr}\\\\\005{= ky}o\005{=b kY}/" || printf "\\o/"
-	elif echo "$distro" | grep -qsi "altlinux"; then
-		logo="alt"
-		$MARKUP && printf "\005{= Yk}$logo" || printf "$logo"
-	elif echo "$distro" | grep -qsi "arch"; then
-		logo=" A "
-		$MARKUP && printf "\005{=b wb}$logo" || printf "$logo"
-	elif echo "$distro" | grep -qsi "centos"; then
-		logo="****"
-		$MARKUP && printf "\005{= gw}*\005{= mw}*\005{= yw}*\005{= bw}*\005{=b Wk}" || printf "$logo"
-	elif echo "$distro" | grep -qsi "debian"; then
-		logo=" @ "
-		$MARKUP && printf "\005{= wr}$logo" || printf "$logo"
-	elif echo "$distro" | grep -qsi "fedora"; then
-		logo=" f "
-		$MARKUP && printf "\005{=b bw}$logo" || printf "$logo"
-	elif echo "$distro" | grep -qsi "foresight"; then
-		logo="<@>"
-		$MARKUP && printf "\005{=b Wg}$logo" || printf "$logo"
-	elif echo "$distro" | grep -qsi "gentoo"; then
-		logo=" > "
-		$MARKUP && printf "\005{=b cw}$logo" || printf "$logo"
-	elif echo "$distro" | grep -qsi "mandriva"; then
-		logo=" (* "
-		$MARKUP && printf "\005{=b kc} (\005{=b ky}* " || printf "$logo"
-	elif echo "$distro" | grep -qsi "redhat"; then
-		logo=" RH "
-		$MARKUP && printf "\005{= Rk}$logo" || printf "$logo"
-	elif echo "$distro" | grep -qsi "slackware"; then
-		logo=",S "
-		$MARKUP && printf "\005{=u Bk}$logo" || printf "$logo"
-	elif echo "$distro" | grep -qsi "suse"; then
-		logo="SuSE"
-		$MARKUP && printf "\005{= Wg}$logo" || printf "$logo"
-	elif echo "$distro" | grep -qsi "xandros"; then
-		logo=" X "
-		$MARKUP && printf "\005{= Wr}$logo" || printf "$logo"
-	else
-		false
-	fi
+	distro=`echo "$1" | tr '[:upper:]' '[:lower:]'`
+	case "$distro" in
+		*ubuntu*)
+			$MARKUP && printf "\005{=b kr}\\\\\005{= ky}o\005{=b kY}/" || printf "\\o/"
+		;;
+		*altlinux*)
+			logo="alt"
+			$MARKUP && printf "\005{= Yk}$logo" || printf "$logo"
+		;;
+	 	*arch*)
+			logo=" A "
+			$MARKUP && printf "\005{=b wb}$logo" || printf "$logo"
+		;;
+		*centos*)
+			logo="****"
+			$MARKUP && printf "\005{= gw}*\005{= mw}*\005{= yw}*\005{= bw}*\005{=b Wk}" || printf "$logo"
+		;;
+		*debian*)
+			logo=" @ "
+			$MARKUP && printf "\005{= wr}$logo" || printf "$logo"
+		;;
+		*fedora*)
+			logo=" f "
+			$MARKUP && printf "\005{=b bw}$logo" || printf "$logo"
+		;;
+		*foresight*)
+			logo="<@>"
+			$MARKUP && printf "\005{=b Wg}$logo" || printf "$logo"
+		;;
+		*gentoo*)
+			logo=" > "
+			$MARKUP && printf "\005{=b cw}$logo" || printf "$logo"
+		;;
+		*mandriva*)
+			logo=" (* "
+			$MARKUP && printf "\005{=b kc} (\005{=b ky}* " || printf "$logo"
+		;;
+		*redhat*)
+			logo=" RH "
+			$MARKUP && printf "\005{= Rk}$logo" || printf "$logo"
+		;;
+		*slackware*)
+			logo=",S "
+			$MARKUP && printf "\005{=u Bk}$logo" || printf "$logo"
+		;;
+		*suse*)
+			logo="SuSE"
+			$MARKUP && printf "\005{= Wg}$logo" || printf "$logo"
+		;;
+		*xandros*)
+			logo=" X "
+			$MARKUP && printf "\005{= Wr}$logo" || printf "$logo"
+		;;
+		*)
+			false
+		;;
+	esac
 }
 
 if [ -r "$HOME/.$PKG/logo" ]; then
diff --git a/debian/changelog b/debian/changelog
index 6c261f4d..fe67be49 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,9 @@ byobu (2.9) unreleased; urgency=low
   * bin/cpu-freq: performance improvement, simplify pipes
   * bin/disk-*: use the POSIX output format
   * bin/ec2-cost: performance improvement, cache ifconfig output
+  * bin/logo: use a case-statement instead of nasty if/then/else stack
 
- -- Dustin Kirkland <kirkland@ubuntu.com>  Mon, 08 Jun 2009 11:44:07 -0500
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Mon, 08 Jun 2009 12:08:58 -0500
 
 byobu (2.8-0ubuntu1) karmic; urgency=low