From c8d28b94393d835e58441e59212db646fa3e90ce Mon Sep 17 00:00:00 2001
From: Louis <spalax@gresille.org>
Date: Sat, 6 Dec 2014 18:32:02 +0100
Subject: Allow several extra library and plugin directories (libdir option)

---
 IkiWiki.pm | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

(limited to 'IkiWiki.pm')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 1043ef402..73fedb0a6 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -361,7 +361,7 @@ sub getsetup () {
 		type => "string",
 		default => "",
 		example => "$ENV{HOME}/.ikiwiki/",
-		description => "extra library and plugin directory",
+		description => "extra library and plugin directorys. Can be either a string (for backward compatibility) or a list of strings.",
 		advanced => 1,
 		safe => 0, # directory
 		rebuild => 0,
@@ -551,6 +551,17 @@ sub getsetup () {
 	},
 }
 
+sub getlibdirs () {
+	if (! ref $config{libdir}) {
+		if (length $config{libdir}) {
+			return [$config{libdir}];
+		} else {
+			return [];
+		}
+	}
+	return $config{libdir};
+}
+
 sub defaultconfig () {
 	my %s=getsetup();
 	my @ret;
@@ -693,14 +704,14 @@ sub checkconfig () {
 sub listplugins () {
 	my %ret;
 
-	foreach my $dir (@INC, $config{libdir}) {
+	foreach my $dir (@INC, @{getlibdirs()}) {
 		next unless defined $dir && length $dir;
 		foreach my $file (glob("$dir/IkiWiki/Plugin/*.pm")) {
 			my ($plugin)=$file=~/.*\/(.*)\.pm$/;
 			$ret{$plugin}=1;
 		}
 	}
-	foreach my $dir ($config{libdir}, "$installdir/lib/ikiwiki") {
+	foreach my $dir (@{getlibdirs()}, "$installdir/lib/ikiwiki") {
 		next unless defined $dir && length $dir;
 		foreach my $file (glob("$dir/plugins/*")) {
 			$ret{basename($file)}=1 if -x $file;
@@ -712,7 +723,9 @@ sub listplugins () {
 
 sub loadplugins () {
 	if (defined $config{libdir} && length $config{libdir}) {
-		unshift @INC, possibly_foolish_untaint($config{libdir});
+		foreach my $dir (@{getlibdirs()}) {
+			unshift @INC, possibly_foolish_untaint($dir);
+		}
 	}
 
 	foreach my $plugin (@{$config{default_plugins}}, @{$config{add_plugins}}) {
@@ -745,8 +758,8 @@ sub loadplugin ($;$) {
 
 	return if ! $force && grep { $_ eq $plugin} @{$config{disable_plugins}};
 
-	foreach my $dir (defined $config{libdir} ? possibly_foolish_untaint($config{libdir}) : undef,
-	                 "$installdir/lib/ikiwiki") {
+	foreach my $possiblytainteddir (@{getlibdirs()}, "$installdir/lib/ikiwiki") {
+		my $dir = defined $possiblytainteddir ? possibly_foolish_untaint($possiblytainteddir) : undef;
 		if (defined $dir && -x "$dir/plugins/$plugin") {
 			eval { require IkiWiki::Plugin::external };
 			if ($@) {
-- 
cgit v1.2.3


From 3ebab88c40bfdddeea16756542ec579daf1f1b5a Mon Sep 17 00:00:00 2001
From: Louis <spalax@gresille.org>
Date: Sat, 6 Dec 2014 18:40:14 +0100
Subject: Make getlibdirs return an array (or whathever this type is called in
 perl)

---
 IkiWiki.pm | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'IkiWiki.pm')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 73fedb0a6..9e2eb0b1a 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -552,14 +552,17 @@ sub getsetup () {
 }
 
 sub getlibdirs () {
+	my $libdirs;
 	if (! ref $config{libdir}) {
 		if (length $config{libdir}) {
-			return [$config{libdir}];
+			$libdirs = [$config{libdir}];
 		} else {
-			return [];
+			$libdirs = [];
 		}
+	} else {
+		$libdirs = $config{libdir};
 	}
-	return $config{libdir};
+	return @{$libdirs};
 }
 
 sub defaultconfig () {
@@ -704,14 +707,14 @@ sub checkconfig () {
 sub listplugins () {
 	my %ret;
 
-	foreach my $dir (@INC, @{getlibdirs()}) {
+	foreach my $dir (@INC, getlibdirs()) {
 		next unless defined $dir && length $dir;
 		foreach my $file (glob("$dir/IkiWiki/Plugin/*.pm")) {
 			my ($plugin)=$file=~/.*\/(.*)\.pm$/;
 			$ret{$plugin}=1;
 		}
 	}
-	foreach my $dir (@{getlibdirs()}, "$installdir/lib/ikiwiki") {
+	foreach my $dir (getlibdirs(), "$installdir/lib/ikiwiki") {
 		next unless defined $dir && length $dir;
 		foreach my $file (glob("$dir/plugins/*")) {
 			$ret{basename($file)}=1 if -x $file;
@@ -723,7 +726,7 @@ sub listplugins () {
 
 sub loadplugins () {
 	if (defined $config{libdir} && length $config{libdir}) {
-		foreach my $dir (@{getlibdirs()}) {
+		foreach my $dir (getlibdirs()) {
 			unshift @INC, possibly_foolish_untaint($dir);
 		}
 	}
@@ -758,7 +761,7 @@ sub loadplugin ($;$) {
 
 	return if ! $force && grep { $_ eq $plugin} @{$config{disable_plugins}};
 
-	foreach my $possiblytainteddir (@{getlibdirs()}, "$installdir/lib/ikiwiki") {
+	foreach my $possiblytainteddir (getlibdirs(), "$installdir/lib/ikiwiki") {
 		my $dir = defined $possiblytainteddir ? possibly_foolish_untaint($possiblytainteddir) : undef;
 		if (defined $dir && -x "$dir/plugins/$plugin") {
 			eval { require IkiWiki::Plugin::external };
-- 
cgit v1.2.3