[gentoo-commits] proj/emacs-tools:emacs-updater commit in: /

["Ulrich Mueller" <ulm@gentoo.org>]

commit:     0c7277c8b1ed178dc16a2cfd558b69e1398c3750
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 11 09:47:31 2013 +0000
Commit:     Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 11 09:47:31 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=0c7277c8

Argument of --colour is optional.

* emacs-updater (OPTIONS): Make argument of the --colour option
optional, for compatibility with ls.
(usage): Update help text.
* emacs-updater.8: Update.

---
 ChangeLog       |    5 +++++
 emacs-updater   |   12 ++++++------
 emacs-updater.8 |   14 +++++++-------
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cfc8003..ed45772 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2013-03-11  Ulrich Müller  <ulm@gentoo.org>
 
+	* emacs-updater (OPTIONS): Make argument of the --colour option
+	optional, for compatibility with ls.
+	(usage): Update help text.
+	* emacs-updater.8: Update.
+
 	* Version 1.11 released.
 
 2013-03-09  Ulrich Müller  <ulm@gentoo.org>

diff --git a/emacs-updater b/emacs-updater
index cccab72..fe9e532 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -31,7 +31,7 @@ usage() {
 	Rebuild Emacs packages that were compiled by another Emacs version,
 	or that are installed in the wrong location.
 	X
-	X  -a, --action ACTION[,ACTION]...
+	X  -a, --action=ACTION[,ACTION]...
 	X                         specify actions, comma-separated list of:
 	X                         'sitedir': find site-init files not in the
 	X                           new-style location
@@ -41,7 +41,7 @@ usage() {
 	X                           byte-compiled Elisp files
 	X                         (default: sitedir,rebuild)
 	X  -b, --batch            batch mode, don't ask any questions
-	X  --color MODE, --colour=MODE
+	X      --color=MODE, --colour=MODE
 	X                         control colour output. MODE is 'yes', 'no',
 	X                         or 'auto'. For 'auto', colour is enabled
 	X                         if standard output is to a terminal
@@ -51,11 +51,11 @@ usage() {
 	X                         Emacs version numbers
 	X  -o, --orphans          list orphan files (implies '--action all')
 	X  -p, --pretend          don't actually emerge packages
-	X  -P, --package-manager PM
+	X  -P, --package-manager=PM
 	X                         select a package manager. PM is one out of
 	X                         'portage', 'pkgcore', or 'paludis'
 	X                         (default: automatically determined)
-	X      --package-manager-command CMD
+	X      --package-manager-command=CMD
 	X                         call CMD instead of the default package
 	X                         manager command. If CMD includes options
 	X                         the whole command string must be quoted
@@ -107,7 +107,7 @@ pm_auto() {
 
 # Read in all command-line options and force English output
 OPTIONS=$(LC_ALL=C getopt -o a:behmnopP: \
-    --long action:,batch,color:,colour:,nocolor,nocolour,exact,help,major \
+    --long action:,batch,color::,colour::,nocolor,nocolour,exact,help,major \
     --long orphans,pretend,package-manager:,package-manager-command:,version \
     -n 'emacs-updater' -- "$@")
 [ $? -eq 0 ] || usage 1
@@ -126,7 +126,7 @@ do
 	-p|--pretend)   PRETEND="true"; shift ;;
 	--color|--colour)
 	    case $2 in
-		yes|y|always|force) COLOUR="yes" ;;
+		yes|y|always|force|"") COLOUR="yes" ;;
 		no|n|never|none) COLOUR="no" ;;
 		auto|tty|if-tty) COLOUR="" ;;
 		*)

diff --git a/emacs-updater.8 b/emacs-updater.8
index c534020..a5dc998 100644
--- a/emacs-updater.8
+++ b/emacs-updater.8
@@ -2,7 +2,7 @@
 .\" Copyright 2008-2013 Gentoo Foundation
 .\" Distributed under the terms of the GNU General Public License v2 or later
 .\"
-.TH emacs-updater 8 "January 2013" "Gentoo Linux"
+.TH emacs-updater 8 "March 2013" "Gentoo Linux"
 .SH NAME
 emacs-updater \- rebuild Emacs packages
 .SH SYNOPSIS
@@ -13,7 +13,7 @@ Find packages that are installed in the wrong location or rebuild all
 GNU Emacs packages.
 .SH OPTIONS
 .TP
-.BI "-a, --action" " ACTION[,ACTION]..."
+.BI "-a, --action=" ACTION[,ACTION]...
 Specify actions, comma-separated list of:
 
 .BR sitedir :
@@ -33,9 +33,9 @@ Rebuild all packages that have byte-compiled Elisp files.
 .B -b, --batch
 Batch mode, don't ask the user any questions.
 .TP
-.BI \-\-color= "mode, " \-\-colour= mode
+.BI \-\-color "[=MODE], " \-\-colour [=MODE]
 Enable or disable colour output.
-.I mode
+.I MODE
 can be
 .BR yes ,
 .BR no ,
@@ -55,12 +55,12 @@ Use only the major version when comparing Emacs version numbers.
 .B -o, --orphans
 List orphan files, i.e. files that are not owned by any package.
 Implies
-.BR "--action all" .
+.BR --action=all .
 .TP
 .B -p, --pretend
 Don't actually emerge packages.
 .TP
-.BI "-P, --package-manager" " PM"
+.BI "-P, --package-manager=" PM
 Select a package manager.
 .I PM
 is one out of
@@ -73,7 +73,7 @@ If the argument
 is given, then the package manager is automatically determined.
 This is the default.
 .TP
-.BI --package-manager-command " CMD"
+.BI --package-manager-command= CMD
 Call
 .I CMD
 instead of the default package manager command.