libdir can be empty
parent
9be28d7865
commit
25142cfa1d
|
@ -433,14 +433,14 @@ sub listplugins () { #{{{
|
||||||
my %ret;
|
my %ret;
|
||||||
|
|
||||||
foreach my $dir (@INC, $config{libdir}) {
|
foreach my $dir (@INC, $config{libdir}) {
|
||||||
next unless defined $dir;
|
next unless defined $dir && length $dir;
|
||||||
foreach my $file (glob("$dir/IkiWiki/Plugin/*.pm")) {
|
foreach my $file (glob("$dir/IkiWiki/Plugin/*.pm")) {
|
||||||
my ($plugin)=$file=~/.*\/(.*)\.pm$/;
|
my ($plugin)=$file=~/.*\/(.*)\.pm$/;
|
||||||
$ret{$plugin}=1;
|
$ret{$plugin}=1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
foreach my $dir ($config{libdir}, "$installdir/lib/ikiwiki") {
|
foreach my $dir ($config{libdir}, "$installdir/lib/ikiwiki") {
|
||||||
next unless defined $dir;
|
next unless defined $dir && length $dir;
|
||||||
foreach my $file (glob("$dir/plugins/*")) {
|
foreach my $file (glob("$dir/plugins/*")) {
|
||||||
$ret{basename($file)}=1 if -x $file;
|
$ret{basename($file)}=1 if -x $file;
|
||||||
}
|
}
|
||||||
|
@ -450,7 +450,7 @@ sub listplugins () { #{{{
|
||||||
} #}}}
|
} #}}}
|
||||||
|
|
||||||
sub loadplugins () { #{{{
|
sub loadplugins () { #{{{
|
||||||
if (defined $config{libdir}) {
|
if (defined $config{libdir} && length $config{libdir}) {
|
||||||
unshift @INC, possibly_foolish_untaint($config{libdir});
|
unshift @INC, possibly_foolish_untaint($config{libdir});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue