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

don't install demo external plugins by default

master
Joey Hess 2008-08-02 16:53:20 -04:00
parent 4708aeceb3
commit 15341aed01
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
IkiWiki/Plugin/websetup.pm
View File

@ -6,7 +6,10 @@ use strict;
use IkiWiki 2.00;
my @rcs_plugins=(qw{git svn bzr mercurial monotone tla norcs});
my @default_force_plugins=(qw{amazon_s3});
# amazon_s3 is not something that should be enabled via the web.
# external is not a standalone plugin.
my @default_force_plugins=(qw{amazon_s3 external});
sub import { #{{{
hook(type => "checkconfig", id => "websetup", call => \&checkconfig);

4
IkiWiki/Setup.pm
View File

@ -77,9 +77,7 @@ sub getsetup () { #{{{
my @ret;
# Load all plugins, so that all setup options are available.
# (But skip a few problematic external demo plugins.)
my @plugins=grep { ! /^(externaldemo|pythondemo|\Q$config{rcs}\E)$/ }
sort(IkiWiki::listplugins());
my @plugins=grep { $_ ne $config{rcs} } sort(IkiWiki::listplugins());
unshift @plugins, $config{rcs} if $config{rcs}; # rcs plugin 1st
foreach my $plugin (@plugins) {
eval { IkiWiki::loadplugin($plugin) };

4
Makefile.PL
View File

@ -67,9 +67,9 @@ extra_install:
done
install -d $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins
for file in `find plugins -maxdepth 1 -type f ! -wholename plugins/.\*`; do \
for file in `find plugins -maxdepth 1 -type f ! -wholename plugins/.\* | grep -v demo`; do \
cp -a $$file $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins; \
done; \
done \
install -d $(DESTDIR)$(PREFIX)/share/man/man1
install -m 644 ikiwiki.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki.1