projects
/
ikiwiki.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c768f9a
)
remove quotes, actualy messed up ikiwiki $(wrapper --params) --foo
author
joey
<joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Tue, 14 Mar 2006 05:51:57 +0000
(
05:51
+0000)
committer
joey
<joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Tue, 14 Mar 2006 05:51:57 +0000
(
05:51
+0000)
ikiwiki
patch
|
blob
|
history
diff --git
a/ikiwiki
b/ikiwiki
index 7794113f5e4c50c27aeea8e4f3e2f4fe31ddb24f..d6057c101278d3bfb9dae3b52119bb99dc6bf672 100755
(executable)
--- a/
ikiwiki
+++ b/
ikiwiki
@@
-69,11
+69,8
@@
sub error { #{{{
if ($config{cgi}) {
print "Content-type: text/html\n\n";
print misctemplate("Error", "<p>Error: @_</p>");
if ($config{cgi}) {
print "Content-type: text/html\n\n";
print misctemplate("Error", "<p>Error: @_</p>");
- exit 1;
- }
- else {
- die @_;
}
}
+ die @_;
} #}}}
sub debug ($) { #{{{
} #}}}
sub debug ($) { #{{{
@@
-364,10
+361,10
@@
sub check_overwrite ($$) { #{{{
my $src=shift;
if (! exists $renderedfiles{$src} && -e $dest && ! $config{rebuild}) {
my $src=shift;
if (! exists $renderedfiles{$src} && -e $dest && ! $config{rebuild}) {
- error("$dest exists and was rendered from ".
+ error("$dest
already
exists and was rendered from ".
join(" ",(grep { $renderedfiles{$_} eq $dest } keys
%renderedfiles)).
join(" ",(grep { $renderedfiles{$_} eq $dest } keys
%renderedfiles)).
- ",
not from $src before not overwriting
");
+ ",
before, so not rendering from $src
");
}
} #}}}
}
} #}}}
@@
-692,7
+689,7
@@
sub gen_wrapper (@) { #{{{
push @params, "--cgiurl=$config{cgiurl}" if length $config{cgiurl};
push @params, "--historyurl=$config{historyurl}" if length $config{historyurl};
push @params, "--anonok" if $config{anonok};
push @params, "--cgiurl=$config{cgiurl}" if length $config{cgiurl};
push @params, "--historyurl=$config{historyurl}" if length $config{historyurl};
push @params, "--anonok" if $config{anonok};
- my $params=join(" ",
map { "\'$_\'" }
@params);
+ my $params=join(" ", @params);
my $call='';
foreach my $p ($this, $this, @params) {
$call.=qq{"$p", };
my $call='';
foreach my $p ($this, $this, @params) {
$call.=qq{"$p", };