Fix plugin detection for user/plugin dir structure

matrix-org · Sep 17, 2020 · 7dc1617 · 7dc1617
1 parent c9ce0bb
commit 7dc1617
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/docker/bootstrap.sh b/docker/bootstrap.sh
@@ -46,7 +46,9 @@ else
         mkdir /sytest/plugins
         echo "--- Downloading plugins for sytest"
         IFS=':'; for plugin in $PLUGIN; do
-            wget -q https://github.com/$plugin/archive/master.tar.gz -O plugin.tar.gz
+            wget -q https://github.com/$plugin/archive/master.tar.gz -O plugin.tar.gz || {
+                echo "Failed to download plugin: $plugin"
+            }
             mkdir -p /sytest/plugins/$plugin
             tar -C /sytest/plugins/$plugin --strip-components=1 -xf plugin.tar.gz
         done

diff --git a/run-tests.pl b/run-tests.pl
@@ -36,7 +36,7 @@
 });
 
 my $plugin_dir = $ENV{"SYTEST_PLUGINS"} || "plugins"; # Read plugin dir from env var SYTEST_PLUGINS or fallback to plugins
-my @plugins = grep { -d } glob(catdir($plugin_dir, "*"));
+my @plugins = grep { -d } glob(catdir($plugin_dir, "*", "*")); # Read all plugins/<author>/<plugin>
 my @lib_dirs = map { catdir($_, "lib") } @plugins;
 
 use Module::Pluggable