move config setting into getopts

master
joey 2006-03-23 08:11:53 +00:00
parent 28055bbcc5
commit d59734caf6
1 changed files with 24 additions and 25 deletions

49
ikiwiki
View File

@ -11,33 +11,32 @@ use lib '.'; # For use without installation, removed by Makefile.
use vars qw{%config %links %oldlinks %oldpagemtime %renderedfiles %pagesources}; use vars qw{%config %links %oldlinks %oldpagemtime %renderedfiles %pagesources};
# Holds global config settings, also used by some modules.
our %config=( #{{{
wiki_file_prune_regexp => qr{((^|/).svn/|\.\.|^\.|\/\.|\.html?$)},
wiki_link_regexp => qr/\[\[([^\s\]]+)\]\]/,
wiki_file_regexp => qr/(^[-A-Za-z0-9_.:\/+]+$)/,
verbose => 0,
wikiname => "wiki",
default_pageext => ".mdwn",
cgi => 0,
svn => 1,
url => '',
cgiurl => '',
historyurl => '',
diffurl => '',
anonok => 0,
rebuild => 0,
wrapper => undef,
wrappermode => undef,
srcdir => undef,
destdir => undef,
templatedir => "/usr/share/ikiwiki/templates",
setup => undef,
adminuser => undef,
); #}}}
sub getconfig () { #{{{ sub getconfig () { #{{{
if (! exists $ENV{WRAPPED_OPTIONS}) { if (! exists $ENV{WRAPPED_OPTIONS}) {
%config=(
wiki_file_prune_regexp => qr{((^|/).svn/|\.\.|^\.|\/\.|\.html?$)},
wiki_link_regexp => qr/\[\[([^\s\]]+)\]\]/,
wiki_file_regexp => qr/(^[-A-Za-z0-9_.:\/+]+$)/,
verbose => 0,
wikiname => "wiki",
default_pageext => ".mdwn",
cgi => 0,
svn => 1,
url => '',
cgiurl => '',
historyurl => '',
diffurl => '',
anonok => 0,
rebuild => 0,
wrapper => undef,
wrappermode => undef,
srcdir => undef,
destdir => undef,
templatedir => "/usr/share/ikiwiki/templates",
setup => undef,
adminuser => undef,
);
eval q{use Getopt::Long}; eval q{use Getopt::Long};
GetOptions( GetOptions(
"setup|s=s" => \$config{setup}, "setup|s=s" => \$config{setup},