From fb327873715e94a67047f9be0e16db8212e4657b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come@opensides.be>
Date: Mon, 19 Jun 2017 17:47:45 +0200
Subject: [PATCH] Fixes #5590 Fixing plugin installation from tar.gz

---
 contrib/bin/fusiondirectory-setup | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/contrib/bin/fusiondirectory-setup b/contrib/bin/fusiondirectory-setup
index 7b75f813b..2df4133a5 100644
--- a/contrib/bin/fusiondirectory-setup
+++ b/contrib/bin/fusiondirectory-setup
@@ -1138,31 +1138,37 @@ sub install_plugins {
     my $plugin = $1;
 
     # copy addons into plugins
-    create_and_copy_plugin_dir($plugin_path."/addons/",$vars{fd_home}."/plugins/addons/");
+    create_and_copy_plugin_dir($plugin_path."/addons/", $vars{fd_home}."/plugins/addons/");
 
     # copy admin into plugins
-    create_and_copy_plugin_dir($plugin_path."/admin/",$vars{fd_home}."/plugins/admin/");
+    create_and_copy_plugin_dir($plugin_path."/admin/", $vars{fd_home}."/plugins/admin/");
 
     # copy personal into plugins
-    create_and_copy_plugin_dir($plugin_path."/personal/",$vars{fd_home}."/plugins/personal/");
+    create_and_copy_plugin_dir($plugin_path."/personal/", $vars{fd_home}."/plugins/personal/");
+
+    # copy extra theme templates
+    create_and_copy_plugin_dir($plugin_path."/ihtml/", $vars{fd_home}."/ihtml/");
+
+    # copy extra theme icons
+    create_and_copy_plugin_dir($plugin_path."/html/themes/", $vars{fd_home}."/html/themes/");
 
     # copy extra HTML and images
-    create_and_copy_plugin_dir($plugin_path."/html/",$vars{fd_home}."/html/plugins/".$plugin);
+    create_and_copy_plugin_dir($plugin_path."/html/", $vars{fd_home}."/html/plugins/".$plugin);
 
     # copy contrib
-    create_and_copy_plugin_dir($plugin_path."/contrib/",$vars{fd_home}."/doc/contrib/".$plugin);
+    create_and_copy_plugin_dir($plugin_path."/contrib/", $vars{fd_home}."/doc/contrib/".$plugin);
 
     # copy config
-    create_and_copy_plugin_dir($plugin_path."/config/",$vars{fd_home}."/plugins/config/");
+    create_and_copy_plugin_dir($plugin_path."/config/", $vars{fd_home}."/plugins/config/");
 
     # copy ldap schema
-    create_and_copy_plugin_dir($plugin_path."/contrib/openldap/",$vars{fd_home}."/contrib/openldap/");
+    create_and_copy_plugin_dir($plugin_path."/contrib/openldap/", $vars{fd_home}."/contrib/openldap/");
 
     # copy includes
-    create_and_copy_plugin_dir($plugin_path."/include/",$vars{fd_home}."/include/");
+    create_and_copy_plugin_dir($plugin_path."/include/", $vars{fd_home}."/include/");
 
     # copy the locales
-    create_and_copy_plugin_dir($plugin_path."/locale/",$vars{fd_home}."/locale/plugins/".$plugin);
+    create_and_copy_plugin_dir($plugin_path."/locale/", $vars{fd_home}."/locale/plugins/".$plugin);
 
   }
 
-- 
GitLab