From ba819966be60f529a97ed0ccba29f6962f41d078 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Tue, 19 Apr 2011 21:28:19 -0400
Subject: v2 v3: options, -M / --maintenance, new alias --keep-processing-files

* new alias --keep-processing-files (see Bug#622902)
* document "--keep-processing-files" alias for "-M" ("--maintenance")
* minor rearrangement of regex
* (Closes: #622902)
---
 lib/sisu/v3/options.rb | 70 +++++++++++++++++++++++++-------------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

(limited to 'lib/sisu/v3')

diff --git a/lib/sisu/v3/options.rb b/lib/sisu/v3/options.rb
index a79b08f3..89efb0a6 100644
--- a/lib/sisu/v3/options.rb
+++ b/lib/sisu/v3/options.rb
@@ -179,41 +179,41 @@ module SiSU_commandline
       unless m.empty?
         m.each do |m|
           case m
-          when /^(?:--color-toggle)$/;                       c=c+'c'
-          when /^(?:--configure)$/;                          c=c+'CC'
-          when /^(?:--dal?|--machine|--abstraction|--abs)$/; c=c+'m'
-          when /^(?:--txt|--text|--plaintext)$/;             c=c+'t'
-          when /^(?:--html)$/;                               c=c+'h'
-          when /^(?:--epub)$/;                               c=c+'e'
-          when /^(?:--od[ft])$/;                             c=c+'o'
-          when /^(?:--pdf)$/;                                c=c+'p'
-          when /^(?:--concordance|--wordmap)$/;              c=c+'w'
-          when /^(?:--manpage)$/;                            c=c+'i'
-          when /^(?:--texinfo)$/;                            c=c+'I'
-          when /^(?:--xhtml)$/;                              c=c+'b'
-          when /^(?:--xml-sax)$/;                            c=c+'x'
-          when /^(?:--xml-dom)$/;                            c=c+'X'
-          when /^(?:--digest)$/;                             c=c+'N'
-          when /^(?:--po4a|--pot?)$/;                        c=c+'P'
-          when /^(?:--termsheet)$/;                          c=c+'T'
-          when /^(?:--manifest)$/;                           c=c+'y'
-          when /^(?:--sqlite)$/;                             c=c+'d'
-          when /^(?:--pg|--pg?sql|--postgresql)$/;           c=c+'D'
-          when /^(?:--remote|--rsync)$/;                     c=c+'R'
-          when /^(?:--scp)$/;                                c=c+'r'
-          when /^(?:--source)$/;                             c=c+'s'
-          when /^(?:--sisupod|--pod)$/;                      c=c+'S'
-          when /^(?:--git)$/;                                c=c+'g'
-          when /^(?:--urls)$/;                               c=c+'U'
-          when /^(?:--zap|--delete)$/;                       c=c+'Z'
-          when /^(?:--sample-search-form)$/;                 c=c+'F'
-          when /^(?:--webserv|--webrick)$/;                  c=c+'W'
-          when /^(?:--maintenance)$/;                        c=c+'M'
-          when /^(?:--verbose[=-]3)$/;                       c=c+'VM'
-          when /^(?:--verbose[=-]2|--Verbose|--VERBOSE)$/;   c=c+'V'
-          when /^(?:--verbose(?:[=-]1)?)$/;                  c=c+'v'
-          when /^(?:--verbose[=-]0|--quiet|--silent)$/;      c=c+'q'
-          else @mod << m
+          when /^--(?:color-toggle)$/;                       c=c+'c'
+          when /^--(?:configure)$/;                          c=c+'CC'
+          when /^--(?:dal?|machine|abstraction|abs)$/;       c=c+'m'
+          when /^--(?:txt|text|plaintext)$/;                 c=c+'t'
+          when /^--(?:html)$/;                               c=c+'h'
+          when /^--(?:epub)$/;                               c=c+'e'
+          when /^--(?:od[ft])$/;                             c=c+'o'
+          when /^--(?:pdf)$/;                                c=c+'p'
+          when /^--(?:concordance|wordmap)$/;                c=c+'w'
+          when /^--(?:manpage)$/;                            c=c+'i'
+          when /^--(?:texinfo)$/;                            c=c+'I'
+          when /^--(?:xhtml)$/;                              c=c+'b'
+          when /^--(?:xml-sax)$/;                            c=c+'x'
+          when /^--(?:xml-dom)$/;                            c=c+'X'
+          when /^--(?:hash-digests)$/;                       c=c+'N'
+          when /^--(?:po4a|pot?)$/;                          c=c+'P'
+          when /^--(?:termsheet)$/;                          c=c+'T'
+          when /^--(?:manifest)$/;                           c=c+'y'
+          when /^--(?:sqlite)$/;                             c=c+'d'
+          when /^--(?:pg|pg?sql|postgresql)$/;               c=c+'D'
+          when /^--(?:remote|rsync)$/;                       c=c+'R'
+          when /^--(?:scp)$/;                                c=c+'r'
+          when /^--(?:source)$/;                             c=c+'s'
+          when /^--(?:sisupod|pod)$/;                        c=c+'S'
+          when /^--(?:git)$/;                                c=c+'g'
+          when /^--(?:urls)$/;                               c=c+'U'
+          when /^--(?:zap|delete)$/;                         c=c+'Z'
+          when /^--(?:sample-search-form)$/;                 c=c+'F'
+          when /^--(?:webserv|webrick)$/;                    c=c+'W'
+          when /^--(?:maintenance|keep-processing-files)$/;  c=c+'M'
+          when /^--(?:verbose[=-]3)$/;                       c=c+'VM'
+          when /^--(?:verbose[=-]2|Verbose|VERBOSE)$/;       c=c+'V'
+          when /^--(?:verbose(?:[=-]1)?)$/;                  c=c+'v'
+          when /^--(?:verbose[=-]0|quiet|silent)$/;          c=c+'q'
+          else mod << m                                     #mod only contains command modifiers; commands converted to character
           end
         end
       end
-- 
cgit v1.2.3