[debian-edu-commits] debian-edu/ 02/04: moved icweasel/firefox cleanup code to postinst just in case firefox-esr and d-e-c are installed concurrently.

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch h01ger/jessie-proposed
in repository debian-edu-config.

commit 074d4dc765fbe0440b7db54e9d5cfb02b0350952
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Sun Jul 17 20:46:39 2016 +0200

    moved icweasel/firefox cleanup code to postinst just in case firefox-esr and d-e-c are installed concurrently.
    
    (cherry picked from commit 2fcfe393bbd9fb14613a0018a123c967b93d5889)
    (cherry picked from commit cc693669a79f0d8c23392b09b257bbc910c69dba)
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 debian/debian-edu-config.postinst | 32 +++++++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/debian/debian-edu-config.postinst b/debian/debian-edu-config.postinst
index 8a805d7..5e39d0a 100644
--- a/debian/debian-edu-config.postinst
+++ b/debian/debian-edu-config.postinst
@@ -227,15 +227,37 @@ configure)
 	rm_conffile debian-edu-config /etc/powerdns/pdns.d/pdns-debian-edu.conf
     fi
 
-    if dpkg --compare-versions "$2" le "1.818+deb8u1" && [ -e /etc/firefox-esr ] ; then
+    if dpkg --compare-versions "$2" le "1.818+deb8u1" && [ -L /usr/bin/firefox-esr ] ; then
+	rm_conffile debian-edu-config /etc/X11/Xsession.d/06debian-edu-iceweasel-ltsp
+	rm_conffile debian-edu-config /etc/apt/apt.conf.d/99-edu-prefer-iceweasel
+	rm_conffile debian-edu-config /etc/init.d/iceweasel-ldapconf
+	rm_conffile debian-edu-config /etc/cfengine/debian-edu/cf.iceweasel
+	if [ -L /etc/iceweasel/pref/debian-edu-networked.js ] ; then
+	    rm /etc/iceweasel/pref/debian-edu-networked.js
+	fi
+	rm_conffile debian-edu-config /usr/share/debian-edu-config/iceweacel-networked-prefs.js
+	if [ -e /etc/iceweasel/pref/debian-edu-homepage-ldap.js ] ; then
+	    rm /etc/iceweasel/pref/debian-edu-homepage-ldap.js
+	fi
+	if [ -e /etc/iceweasel/profile/cert_override.txt ] ; then
+	    rm /etc/iceweasel/profile/cert_override.txt
+	fi
 	# for networked profiles only.
-	if egrep Standalone /etc/debian-edu/config; then
+	if grep -q Standalone /etc/debian-edu/config; then
 	    :
-        else
+	else
 	    if ! [ -e /etc/firefox-esr/debian-edu-networked.js ] ; then
-	        ln -s /usr/share/debian-edu-config/firefox-networked-prefs.js /etc/firefox-esr/debian-edu-networked.js
+		ln -s /usr/share/debian-edu-config/firefox-networked-prefs.js /etc/firefox-esr/debian-edu-networked.js
+		if ! [ -e /etc/ltsp_chroot ] ; then
+		    /usr/share/debian-edu-config/tools/update-firefox-homepage ldap:homepage
+		    if grep -q Thin-Client-Server /etc/debian-edu/config && [ -d /opt/ltsp ] ; then
+			for ltsp_chroot in `find /opt/ltsp/ -mindepth 1 -maxdepth 1 -type d`; do
+			    chroot $ltsp_chroot /usr/share/debian-edu-config/tools/update-firefox-homepage ldap:homepage
+			done
+		    fi
+		fi
 	    fi
-        fi
+	fi
     fi
 
     # sssd refuses to read the file if it has any other mode

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git