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

At Branden's request, clean up the hardcoded ".ikiwiki" everywhere, and add 

checkoptions() that can be used to set defaults for this and other options
based on existing options.

Also involved some cleanups to how gen_wrapper is used.
master
joey 2006-03-23 04:01:02 +00:00
parent 0b1828f694
commit e4d9da55d9
2 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
IkiWiki/Setup/Standard.pm
View File

@ -14,7 +14,9 @@ sub import {
::debug("generating wrappers.."); ::debug("generating wrappers..");
foreach my $wrapper (@{$setup{wrappers}}) { foreach my $wrapper (@{$setup{wrappers}}) {
::gen_wrapper(%::config, verbose => 0, %setup, %{$wrapper}); %::config=(%::config, verbose => 0, %setup, %{$wrapper});
::checkoptions();
::gen_wrapper();
} }
::debug("rebuilding wiki.."); ::debug("rebuilding wiki..");
@ -23,6 +25,7 @@ sub import {
if defined $setup{$c} && ! ref $setup{$c}; if defined $setup{$c} && ! ref $setup{$c};
} }
$::config{rebuild}=1; $::config{rebuild}=1;
::checkoptions();
::refresh(); ::refresh();
::debug("done"); ::debug("done");

43
ikiwiki
View File

@ -63,11 +63,17 @@ if (! $config{setup}) {
usage() unless @ARGV == 2; usage() unless @ARGV == 2;
$config{srcdir} = possibly_foolish_untaint(shift); $config{srcdir} = possibly_foolish_untaint(shift);
$config{destdir} = possibly_foolish_untaint(shift); $config{destdir} = possibly_foolish_untaint(shift);
checkoptions();
}
#}}}
sub checkoptions { #{{{
if ($config{cgi} && ! length $config{url}) { if ($config{cgi} && ! length $config{url}) {
error("Must specify url to wiki with --url when using --cgi"); error("Must specify url to wiki with --url when using --cgi");
} }
} $config{wikistatedir}="$config{srcdir}/.ikiwiki"
#}}} unless exists $config{wikistatedir};
} #}}}
sub usage { #{{{ sub usage { #{{{
die "usage: ikiwiki [options] source dest\n"; die "usage: ikiwiki [options] source dest\n";
@ -415,10 +421,11 @@ sub render ($) { #{{{
sub lockwiki () { #{{{ sub lockwiki () { #{{{
# Take an exclusive lock on the wiki to prevent multiple concurrent # Take an exclusive lock on the wiki to prevent multiple concurrent
# run issues. The lock will be dropped on program exit. # run issues. The lock will be dropped on program exit.
if (! -d "$config{srcdir}/.ikiwiki") { if (! -d $config{wikistatedir}) {
mkdir("$config{srcdir}/.ikiwiki"); mkdir($config{wikistatedir});
} }
open(WIKILOCK, ">$config{srcdir}/.ikiwiki/lockfile") || error ("cannot write to lockfile: $!"); open(WIKILOCK, ">$config{wikistatedir}/lockfile") ||
error ("cannot write to $config{wikistatedir}/lockfile: $!");
if (! flock(WIKILOCK, 2 | 4)) { if (! flock(WIKILOCK, 2 | 4)) {
debug("wiki seems to be locked, waiting for lock"); debug("wiki seems to be locked, waiting for lock");
my $wait=600; # arbitrary, but don't hang forever to my $wait=600; # arbitrary, but don't hang forever to
@ -436,7 +443,7 @@ sub unlockwiki () { #{{{
} #}}} } #}}}
sub loadindex () { #{{{ sub loadindex () { #{{{
open (IN, "$config{srcdir}/.ikiwiki/index") || return; open (IN, "$config{wikistatedir}/index") || return;
while (<IN>) { while (<IN>) {
$_=possibly_foolish_untaint($_); $_=possibly_foolish_untaint($_);
chomp; chomp;
@ -452,10 +459,11 @@ sub loadindex () { #{{{
} #}}} } #}}}
sub saveindex () { #{{{ sub saveindex () { #{{{
if (! -d "$config{srcdir}/.ikiwiki") { if (! -d $config{wikistatedir}) {
mkdir("$config{srcdir}/.ikiwiki"); mkdir($config{wikistatedir});
} }
open (OUT, ">$config{srcdir}/.ikiwiki/index") || error("cannot write to index: $!"); open (OUT, ">$config{wikistatedir}/index") ||
error("cannot write to $config{wikistatedir}/index: $!");
foreach my $page (keys %oldpagemtime) { foreach my $page (keys %oldpagemtime) {
print OUT "$oldpagemtime{$page} $pagesources{$page} $renderedfiles{$page} ". print OUT "$oldpagemtime{$page} $pagesources{$page} $renderedfiles{$page} ".
join(" ", @{$links{$page}})."\n" join(" ", @{$links{$page}})."\n"
@ -758,8 +766,7 @@ FILE: foreach my $file (@files) {
} }
} #}}} } #}}}
sub gen_wrapper (@) { #{{{ sub gen_wrapper () { #{{{
my %config=(@_);
eval q{use Cwd 'abs_path'}; eval q{use Cwd 'abs_path'};
$config{srcdir}=abs_path($config{srcdir}); $config{srcdir}=abs_path($config{srcdir});
$config{destdir}=abs_path($config{destdir}); $config{destdir}=abs_path($config{destdir});
@ -883,7 +890,7 @@ sub userinfo_get ($$) { #{{{
my $field=shift; my $field=shift;
eval q{use Storable}; eval q{use Storable};
my $userdata=eval{ Storable::lock_retrieve("$config{srcdir}/.ikiwiki/userdb") }; my $userdata=eval{ Storable::lock_retrieve("$config{wikistatedir}/userdb") };
if (! defined $userdata || ! ref $userdata || if (! defined $userdata || ! ref $userdata ||
! exists $userdata->{$user} || ! ref $userdata->{$user} || ! exists $userdata->{$user} || ! ref $userdata->{$user} ||
! exists $userdata->{$user}->{$field}) { ! exists $userdata->{$user}->{$field}) {
@ -898,7 +905,7 @@ sub userinfo_set ($$$) { #{{{
my $value=shift; my $value=shift;
eval q{use Storable}; eval q{use Storable};
my $userdata=eval{ Storable::lock_retrieve("$config{srcdir}/.ikiwiki/userdb") }; my $userdata=eval{ Storable::lock_retrieve("$config{wikistatedir}/userdb") };
if (! defined $userdata || ! ref $userdata || if (! defined $userdata || ! ref $userdata ||
! exists $userdata->{$user} || ! ref $userdata->{$user}) { ! exists $userdata->{$user} || ! ref $userdata->{$user}) {
return ""; return "";
@ -906,7 +913,7 @@ sub userinfo_set ($$$) { #{{{
$userdata->{$user}->{$field}=$value; $userdata->{$user}->{$field}=$value;
my $oldmask=umask(077); my $oldmask=umask(077);
my $ret=Storable::lock_store($userdata, "$config{srcdir}/.ikiwiki/userdb"); my $ret=Storable::lock_store($userdata, "$config{wikistatedir}/userdb");
umask($oldmask); umask($oldmask);
return $ret; return $ret;
} #}}} } #}}}
@ -916,13 +923,13 @@ sub userinfo_setall ($$) { #{{{
my $info=shift; my $info=shift;
eval q{use Storable}; eval q{use Storable};
my $userdata=eval{ Storable::lock_retrieve("$config{srcdir}/.ikiwiki/userdb") }; my $userdata=eval{ Storable::lock_retrieve("$config{wikistatedir}/userdb") };
if (! defined $userdata || ! ref $userdata) { if (! defined $userdata || ! ref $userdata) {
$userdata={}; $userdata={};
} }
$userdata->{$user}=$info; $userdata->{$user}=$info;
my $oldmask=umask(077); my $oldmask=umask(077);
my $ret=Storable::lock_store($userdata, "$config{srcdir}/.ikiwiki/userdb"); my $ret=Storable::lock_store($userdata, "$config{wikistatedir}/userdb");
umask($oldmask); umask($oldmask);
return $ret; return $ret;
} #}}} } #}}}
@ -1418,7 +1425,7 @@ sub cgi () { #{{{
my $oldmask=umask(077); my $oldmask=umask(077);
my $session = CGI::Session->new("driver:db_file", $q, my $session = CGI::Session->new("driver:db_file", $q,
{ FileName => "$config{srcdir}/.ikiwiki/sessions.db" }); { FileName => "$config{wikistatedir}/sessions.db" });
umask($oldmask); umask($oldmask);
# Everything below this point needs the user to be signed in. # Everything below this point needs the user to be signed in.
@ -1464,7 +1471,7 @@ sub setup () { # {{{
setup() if $config{setup}; setup() if $config{setup};
lockwiki(); lockwiki();
if ($config{wrapper}) { if ($config{wrapper}) {
gen_wrapper(%config); gen_wrapper();
exit; exit;
} }
memoize('pagename'); memoize('pagename');