From 9d61f9401180da67c65ee7f4c85999f4fb40fd0c Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Mon, 13 Sep 2010 07:54:13 -0400
Subject: options, add expressive options --[name] as alternative to flags -[x]
---
CHANGELOG_v2 | 7 +++++++
data/doc/sisu/v2/CHANGELOG | 7 +++++++
lib/sisu/v2/options.rb | 43 +++++++++++++++++++++++++++++++++----------
3 files changed, 47 insertions(+), 10 deletions(-)
diff --git a/CHANGELOG_v2 b/CHANGELOG_v2
index 5174c055..36c2bc99 100644
--- a/CHANGELOG_v2
+++ b/CHANGELOG_v2
@@ -83,6 +83,13 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.6.3.orig.tar.gz
* html headers do not include the "title" field, fix (Closes: #594949)
(param, variable not set (presumably since change from v1 to v2))
+ (2010-09-13:37/1)
+ sisu_2.6.3-5.dsc
+ sisu_2.6.3-5.diff.gz
+ [debian freeze, code and documentation fixes]
+
+ * options, add expressive options --[name] as alternative to flags -[x]
+
%% 2.6.2.orig.tar.gz (2010-07-15:28/4)
http://www.jus.uio.no/sisu/pkg/src/sisu_2.6.2.orig.tar.gz
63ffa027e66ed18d5d56d8e82e79a437bcec362e7c16d6d4ae26fa0d029f80ae 2730609 sisu_2.6.2.orig.tar.gz
diff --git a/data/doc/sisu/v2/CHANGELOG b/data/doc/sisu/v2/CHANGELOG
index 31b22b98..1db28e99 100644
--- a/data/doc/sisu/v2/CHANGELOG
+++ b/data/doc/sisu/v2/CHANGELOG
@@ -83,6 +83,13 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.6.3.orig.tar.gz
* html headers do not include the "title" field, fix (Closes: #594949)
(param, variable not set (presumably since change from v1 to v2))
+ (2010-09-13:37/1)
+ sisu_2.6.3-5.dsc
+ sisu_2.6.3-5.diff.gz
+ [debian freeze, code and documentation fixes]
+
+ * options, add expressive options --[name] as alternative to flags -[x]
+
%% 2.6.2.orig.tar.gz (2010-07-15:28/4)
http://www.jus.uio.no/sisu/pkg/src/sisu_2.6.2.orig.tar.gz
63ffa027e66ed18d5d56d8e82e79a437bcec362e7c16d6d4ae26fa0d029f80ae 2730609 sisu_2.6.2.orig.tar.gz
diff --git a/lib/sisu/v2/options.rb b/lib/sisu/v2/options.rb
index fbf8336a..94a23590 100644
--- a/lib/sisu/v2/options.rb
+++ b/lib/sisu/v2/options.rb
@@ -125,16 +125,39 @@ module SiSU_commandline
unless m.empty?
m.each do |m|
case m
- 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'
+ when /--color-toggle/; c=c+'c'
+ when /--configure/; c=c+'C' # issue should be CC
+ when /--machine|--middle/; 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 /--termsheet/; c=c+'T'
+ when /--manifest/; c=c+'my'
+ when /--sqlite/; c=c+'d'
+ when /--pg|--psql/; c=c+'D'
+ when /--remote|--rsync/; c=c+'R'
+ when /--scp/; c=c+'r'
+ when /--source/; c=c+'s'
+ when /--sisupod/; 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
end
end
--
cgit v1.2.3