projects
/
ikiwiki.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed
[ikiwiki.git]
/
IkiWiki.pm
diff --git
a/IkiWiki.pm
b/IkiWiki.pm
index 7d1f5c401f3daf6f6eeb7726a46e2f36fa1a7356..8136a7c4b67cff3ead2bae127b8020559111e132 100644
(file)
--- a/
IkiWiki.pm
+++ b/
IkiWiki.pm
@@
-336,6
+336,14
@@
sub getsetup () {
safe => 0, # paranoia
rebuild => 0,
},
safe => 0, # paranoia
rebuild => 0,
},
+ timezone => {
+ type => "string",
+ default => "",
+ example => "US/Eastern",
+ description => "time zone name",
+ safe => 1,
+ rebuild => 1,
+ },
include => {
type => "string",
default => undef,
include => {
type => "string",
default => undef,
@@
-477,7
+485,7
@@
sub getsetup () {
},
setuptype => {
type => "internal",
},
setuptype => {
type => "internal",
- default => "
Standard
",
+ default => "
Yaml
",
description => "perl class to use to dump setup file",
safe => 0,
rebuild => 0,
description => "perl class to use to dump setup file",
safe => 0,
rebuild => 0,
@@
-497,7
+505,6
@@
sub defaultconfig () {
foreach my $key (keys %s) {
push @ret, $key, $s{$key}->{default};
}
foreach my $key (keys %s) {
push @ret, $key, $s{$key}->{default};
}
- use Data::Dumper;
return @ret;
}
return @ret;
}
@@
-529,6
+536,12
@@
sub checkconfig () {
$ENV{$val}=$config{ENV}{$val};
}
}
$ENV{$val}=$config{ENV}{$val};
}
}
+ if (defined $config{timezone} && length $config{timezone}) {
+ $ENV{TZ}=$config{timezone};
+ }
+ else {
+ $config{timezone}=$ENV{TZ};
+ }
if ($config{w3mmode}) {
eval q{use Cwd q{abs_path}};
if ($config{w3mmode}) {
eval q{use Cwd q{abs_path}};
@@
-1168,7
+1181,7
@@
sub urlto ($;$$) {
}
if (! defined $from) {
}
if (! defined $from) {
- my $u = $local_url;
+ my $u = $local_url
|| ''
;
$u =~ s{/$}{};
return $u.beautify_urlpath("/".$to);
}
$u =~ s{/$}{};
return $u.beautify_urlpath("/".$to);
}
@@
-1379,10
+1392,14
@@
sub preprocess ($$$;$$) {
|
"([^"]*?)" # 3: single-quoted value
|
|
"([^"]*?)" # 3: single-quoted value
|
- (\S+) # 4: unquoted value
+ '''(.*?)''' # 4: triple-single-quote
+ |
+ <<(?<start>[a-zA-Z]+)\n(?<heredoc>.*?)\n\k<start> # 5, 6: heredoc'd value.
+ |
+ (\S+) # 7: unquoted value
)
(?:\s+|$) # delimiter to next param
)
(?:\s+|$) # delimiter to next param
- }sgx) {
+ }
m
sgx) {
my $key=$1;
my $val;
if (defined $2) {
my $key=$1;
my $val;
if (defined $2) {
@@
-1397,6
+1414,12
@@
sub preprocess ($$$;$$) {
elsif (defined $4) {
$val=$4;
}
elsif (defined $4) {
$val=$4;
}
+ elsif (defined $7) {
+ $val=$7;
+ }
+ elsif (defined $+{heredoc}) {
+ $val=$+{heredoc};
+ }
if (defined $key) {
push @params, $key, $val;
if (defined $key) {
push @params, $key, $val;
@@
-1465,6
+1488,10
@@
sub preprocess ($$$;$$) {
|
"[^"]*?" # single-quoted value
|
|
"[^"]*?" # single-quoted value
|
+ <<(?<start>[a-zA-Z]+)\n(?<heredoc>.*?)\n\k<start> # heredoc'd value.
+ |
+ '''.*?''' # triple-single-quoted value
+ |
[^"\s\]]+ # unquoted value
)
\s* # whitespace or end
[^"\s\]]+ # unquoted value
)
\s* # whitespace or end
@@
-1488,6
+1515,10
@@
sub preprocess ($$$;$$) {
|
"[^"]*?" # single-quoted value
|
|
"[^"]*?" # single-quoted value
|
+ '''.*?''' # triple-single-quoted value
+ |
+ <<(?<start>[a-zA-Z]+)\n(?<heredoc>.*?)\n\k<start> # heredoc'd value.
+ |
[^"\s\]]+ # unquoted value
)
\s* # whitespace or end
[^"\s\]]+ # unquoted value
)
\s* # whitespace or end