From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
	by finch.gentoo.org with esmtp (Exim 4.60)
	(envelope-from <gentoo-commits+bounces-138468-garchives=archives.gentoo.org@lists.gentoo.org>)
	id 1LtRpg-0003fn-CG
	for garchives@archives.gentoo.org; Mon, 13 Apr 2009 19:28:40 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id CB9F7E07AE;
	Mon, 13 Apr 2009 19:28:39 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	by pigeon.gentoo.org (Postfix) with ESMTP id A4B32E07AE
	for <gentoo-commits@lists.gentoo.org>; Mon, 13 Apr 2009 19:28:39 +0000 (UTC)
Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133])
	(using TLSv1 with cipher AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTP id 1EBCA64B4D
	for <gentoo-commits@lists.gentoo.org>; Mon, 13 Apr 2009 19:28:39 +0000 (UTC)
Received: from ulm by stork.gentoo.org with local (Exim 4.69)
	(envelope-from <ulm@stork.gentoo.org>)
	id 1LtRpd-0001QU-Q8
	for gentoo-commits@lists.gentoo.org; Mon, 13 Apr 2009 19:28:37 +0000
To: gentoo-commits@lists.gentoo.org
From: "Ulrich Mueller (ulm)" <ulm@gentoo.org>
Subject: [gentoo-commits] emacs r1250 - emacs-updater
X-VCS-Repository: emacs
X-VCS-Revision: 1250
X-VCS-Files: emacs-updater/ChangeLog emacs-updater/emacs-updater
X-VCS-Directories: emacs-updater
X-VCS-Committer: ulm
X-VCS-Committer-Name: Ulrich Mueller
Content-Type: text/plain; charset=UTF-8
Message-Id: <E1LtRpd-0001QU-Q8@stork.gentoo.org>
Sender: Ulrich Mueller <ulm@stork.gentoo.org>
Date: Mon, 13 Apr 2009 19:28:37 +0000
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: 0f1c0ff7-bac3-44cd-8b3a-52c859134751
X-Archives-Hash: a843af9d832d241de8e98993dfbdbb0d

Author: ulm
Date: 2009-04-13 19:28:37 +0000 (Mon, 13 Apr 2009)
New Revision: 1250

Modified:
   emacs-updater/ChangeLog
   emacs-updater/emacs-updater
Log:
Change initialisation of colours, since POSIX tput has no -S option.

Modified: emacs-updater/ChangeLog
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- emacs-updater/ChangeLog	2009-04-13 08:07:49 UTC (rev 1249)
+++ emacs-updater/ChangeLog	2009-04-13 19:28:37 UTC (rev 1250)
@@ -1,3 +1,8 @@
+2009-04-13  Ulrich Mueller  <ulm@gentoo.org>
+
+	* emacs-updater (RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN):
+	Change initialisation, since POSIX tput has no -S option.
+
 2009-04-11  Ulrich Mueller  <ulm@gentoo.org>
=20
 	* emacs-updater (have_portage, have_pkgcore, have_paludis):

Modified: emacs-updater/emacs-updater
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- emacs-updater/emacs-updater	2009-04-13 08:07:49 UTC (rev 1249)
+++ emacs-updater/emacs-updater	2009-04-13 19:28:37 UTC (rev 1250)
@@ -80,7 +80,7 @@
=20
 # Read in all command-line options and force English output
 OPTIONS=3D$(LC_ALL=3DC getopt -o a:ehnpP: \
-    --long action:,exact,help,nocolour,pretend,package-manager: \
+    --long action:,exact,help,nocolour,nocolor,pretend,package-manager: =
\
     -n 'emacs-updater' -- "$@")
 [ $? -eq 0 ] || usage 1
=20
@@ -92,7 +92,7 @@
 	-h|--help)      usage 0 ;;
 	-e|--exact)     EXACT=3D"true"; shift 1 ;;
 	-p|--pretend)   PRETEND=3D"true"; shift 1 ;;
-	-n|--nocolour)  NOCOLOUR=3D"true"; shift 1 ;;
+	-n|--nocolour|--nocolor) NOCOLOUR=3D"true"; shift 1 ;;
 	-a|--action)
 	    ACTIONS=3D
 	    for action in ${2/,/ }; do
@@ -133,16 +133,16 @@
 # Only set colours if output is not redirected or the --no-colour
 # option is not set
 if [ -t 1 ] && [ -z "${NOCOLOUR}" ] ; then
-    RED=3D$(tput -S <<<$'setaf 1\nbold')
-    GREEN=3D$(tput -S <<<$'setaf 2\nbold')
-    YELLOW=3D$(tput -S <<<$'setaf 3\nbold')
-    BLUE=3D$(tput -S <<<$'setaf 4\nbold')
-    MAGENTA=3D$(tput -S <<<$'setaf 5\nbold')
-    CYAN=3D$(tput -S <<<$'setaf 6\nbold')
     BOLD=3D$(tput bold)
     NORMAL=3D$(tput sgr0)
+    RED=3D$(tput setaf 1)${BOLD}
+    GREEN=3D$(tput setaf 2)${BOLD}
+    YELLOW=3D$(tput setaf 3)${BOLD}
+    BLUE=3D$(tput setaf 4)${BOLD}
+    MAGENTA=3D$(tput setaf 5)${BOLD}
+    CYAN=3D$(tput setaf 6)${BOLD}
 else
-    RED=3D; GREEN=3D; YELLOW=3D; BLUE=3D; MAGENTA=3D; CYAN=3D; BOLD=3D; =
NORMAL=3D
+    BOLD=3D; NORMAL=3D; RED=3D; GREEN=3D; YELLOW=3D; BLUE=3D; MAGENTA=3D=
; CYAN=3D
 fi
=20
 # Some type of output can be prettified and capsulated in functions