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

remove quotes, actualy messed up ikiwiki $(wrapper --params) --foo

master
joey 2006-03-14 05:51:57 +00:00
parent c768f9a2e9
commit 2885278ebd
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ikiwiki
View File

@ -69,11 +69,8 @@ sub error { #{{{
if ($config{cgi}) { if ($config{cgi}) {
print "Content-type: text/html\n\n"; print "Content-type: text/html\n\n";
print misctemplate("Error", "<p>Error: @_</p>"); 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; my $src=shift;
if (! exists $renderedfiles{$src} && -e $dest && ! $config{rebuild}) { 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 join(" ",(grep { $renderedfiles{$_} eq $dest } keys
%renderedfiles)). %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, "--cgiurl=$config{cgiurl}" if length $config{cgiurl};
push @params, "--historyurl=$config{historyurl}" if length $config{historyurl}; push @params, "--historyurl=$config{historyurl}" if length $config{historyurl};
push @params, "--anonok" if $config{anonok}; push @params, "--anonok" if $config{anonok};
my $params=join(" ", map { "\'$_\'" } @params); my $params=join(" ", @params);
my $call=''; my $call='';
foreach my $p ($this, $this, @params) { foreach my $p ($this, $this, @params) {
$call.=qq{"$p", }; $call.=qq{"$p", };