CKEditor refactoring

LDAPAccountManager · Sep 18, 2023 · 04b80a5 · 04b80a5
1 parent 0a7149b
commit 04b80a5
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 0 deletions.
diff --git a/lam-packaging/debian/changelog b/lam-packaging/debian/changelog
@@ -1,6 +1,8 @@
 ldap-account-manager (8.5.RC1-1) unstable; urgency=medium
 
   * new upstream release
+  * Fix "Multiple embeded and minified javascript library" by linking
+    directory (Closes: #1042528)
 
  -- Roland Gruber <[email protected]>  Fri, 08 Sep 2023 16:01:22 +0200
 

diff --git a/lam-packaging/debian/control b/lam-packaging/debian/control
@@ -16,6 +16,7 @@ Depends: php (>= 7.4), php-ldap,
  libapache2-mod-php | libapache2-mod-fcgid | php-fpm,
  apache2 (>= 2.4.0) | httpd,
  gettext, fonts-dejavu,
+ ckeditor (>= 4.0), libjs-jquery-jstree (>= 3.3.0),
  debconf (>= 0.2.26) | debconf-2.0, ${misc:Depends}
 Recommends: php-opcache
 Suggests: ldap-server, php-mcrypt, ldap-account-manager-lamdaemon, perl

diff --git a/lam-packaging/debian/postinst b/lam-packaging/debian/postinst
@@ -9,6 +9,14 @@ fi
 . /usr/share/debconf/confmodule
 db_version 2.0 || [ $? -lt 30 ]
 
+# 3rd party libs
+jsThirdPartyLibs='ckeditor jstree'
+for jsThirdPartyLib in $jsThirdPartyLibs; do
+	if [ ! -L /usr/share/ldap-account-manager/templates/lib/extra/${jsThirdPartyLib} ] ; then
+		ln -s /usr/share/javascript/${jsThirdPartyLib} /usr/share/ldap-account-manager/templates/lib/extra/${jsThirdPartyLib}
+	fi
+done
+
 cd /usr/share/ldap-account-manager/config-samples/profiles
 files=`ls -a default.*`
 for file in $files; do

diff --git a/lam-packaging/debian/postrm b/lam-packaging/debian/postrm
@@ -50,6 +50,15 @@ if [ -f /usr/share/debconf/confmodule ]; then
 		done
 	fi
 
+	# 3rd party libs
+	jsThirdPartyLibs='ckeditor jstree'
+	for jsThirdPartyLib in $jsThirdPartyLibs; do
+		if [ -L /usr/share/ldap-account-manager/templates/lib/extra/${jsThirdPartyLib} ] ; then
+			rm /usr/share/ldap-account-manager/templates/lib/extra/${jsThirdPartyLib}
+		fi
+	done
+
+
 	set -e
 	if [ "$1" = "purge" ]; then
 		rm -r -f /usr/share/ldap-account-manager

diff --git a/lam-packaging/debian/preinst b/lam-packaging/debian/preinst
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -e
+
+if [ "$1" != "upgrade" ]; then
+    exit 0
+fi
+
+# 3rd party libs
+jsThirdPartyLibs='ckeditor jstree'
+for jsThirdPartyLib in $jsThirdPartyLibs; do
+	if [ -L /usr/share/ldap-account-manager/templates/lib/extra/${jsThirdPartyLib} ] ; then
+		rm /usr/share/ldap-account-manager/templates/lib/extra/${jsThirdPartyLib}
+	fi
+done
+
+#DEBHELPER#