From: Joey Hess <joey@kodama.kitenet.net>
Date: Sat, 2 Aug 2008 20:53:20 +0000 (-0400)
Subject: don't install demo external plugins by default
X-Git-Tag: 2.60~120
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=15341aed015e4b23d0a1171779d5baa0414c4fad;p=ikiwiki.git

don't install demo external plugins by default
---

diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm
index 0a0d4480f..2b9240a29 100644
--- a/IkiWiki/Plugin/websetup.pm
+++ b/IkiWiki/Plugin/websetup.pm
@@ -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);
diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index 73e32447c..d14be879d 100644
--- a/IkiWiki/Setup.pm
+++ b/IkiWiki/Setup.pm
@@ -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) };
diff --git a/Makefile.PL b/Makefile.PL
index a805f41a2..ac4ec2644 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -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