urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ikiwiki
View File

@ -11,8 +11,9 @@ use lib '.'; # For use without installation, removed by Makefile.
use vars qw{%config %links %oldlinks %oldpagemtime %renderedfiles %pagesources};
# Holds global config settings, also used by some modules.
our %config=( #{{{
sub getconfig () { #{{{
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_.:\/+]+$)/,
@ -34,10 +35,8 @@ our %config=( #{{{
templatedir => "/usr/share/ikiwiki/templates",
setup => undef,
adminuser => undef,
); #}}}
);
sub getconfig () { #{{{
if (! exists $ENV{WRAPPED_OPTIONS}) {
eval q{use Getopt::Long};
GetOptions(
"setup|s=s" => \$config{setup},