From 5cab15b5c30580ddab1bd4b85d2a5ed399c7b37b Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Tue, 27 Jan 2009 14:05:32 -0500 Subject: [PATCH] * select-screen-profile: limit erroneous attempts to 5; make the "plain" profile default; remove the "recommended" pointer --- debian/changelog | 5 +++-- select-screen-profile | 8 +++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 260aa76d..9e6d4d33 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ screen-profiles (1.16) UNRELEASED; urgency=low - * + * select-screen-profile: limit erroneous attempts to 5; make the "plain" + profile default; remove the "recommended" pointer - -- Dustin Kirkland Mon, 26 Jan 2009 15:24:52 -0600 + -- Dustin Kirkland Tue, 27 Jan 2009 12:36:44 -0500 screen-profiles (1.15-0ubuntu1) jaunty; urgency=low diff --git a/select-screen-profile b/select-screen-profile index 6e1cc96a..0be83a0c 100755 --- a/select-screen-profile +++ b/select-screen-profile @@ -72,14 +72,20 @@ prompt() { i=$(expr $i + 1) desc=" " if [ "$x" = "ubuntu" ]; then - desc="-light\t<---- ` gettext 'recommended'`" + desc="-light\t" + elif [ "$x" = "plain" ]; then simple=$i fi echo " $i. $x$desc" done echo selected=x + count=1 while /bin/true; do + if [ $count -gt 5 ]; then + exit 1 + fi + count=`expr $count + 1` if [ -z "$selected" -a ! -z "$simple" ]; then selected="$simple" elif ! test $selected -gt 0 2>/dev/null; then