aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2012-05-28 04:11:46 -0400
committerRalph Amissah <ralph@amissah.com>2012-05-28 04:11:46 -0400
commit6e6602f06f40403f002ee5164e727fc6efc042b1 (patch)
treedac01d72c7decf7f4f5dd2ad35c80e4da3e63aa8
parentv3: hub, "requires", fix (diff)
v3: options, --init-site, --configure, fix
-rw-r--r--data/doc/sisu/CHANGELOG_v32
-rw-r--r--lib/sisu/v3/options.rb4
2 files changed, 4 insertions, 2 deletions
diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3
index 05bc8e83..c7af2e17 100644
--- a/data/doc/sisu/CHANGELOG_v3
+++ b/data/doc/sisu/CHANGELOG_v3
@@ -23,6 +23,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.2.10.orig.tar.xz
* v3: hub, "requires", fix
+* v3: options, --init-site, --configure, fix
+
* v3: code headers, mostly copyright
%% 3.2.9.orig.tar.xz (2012-05-19:20/6)
diff --git a/lib/sisu/v3/options.rb b/lib/sisu/v3/options.rb
index fc356ec5..1452de4b 100644
--- a/lib/sisu/v3/options.rb
+++ b/lib/sisu/v3/options.rb
@@ -348,7 +348,7 @@ module SiSU_Commandline
m.each do |m|
case m
when /^--(?:color-toggle)$/; c=c+'c'
- when /^--(?:configure)$/; c=c+'CC'
+ when /^--(?:configure|init-site)$/; c=c+'CC'
when /^--(?:dal?|machine|abstraction|abs)$/; c=c+'m'
when /^--(?:txt|text|plaintext)$/; c=c+'t'
when /^--(?:html)$/; c=c+'h'
@@ -441,7 +441,7 @@ module SiSU_Commandline
? { bool: true, set: :on }
: { bool: false, set: :na }
act[:site_init]=(cmd =~/C/ \
- || mod.inspect =~/"--init-site/) \
+ || mod.inspect =~/"--init-site"|"--configure"/) \
? { bool: true, set: :on }
: { bool: false, set: :na }
act[:rc]=if mod.inspect =~/"--rc=/