[debian-edu-commits] debian-edu/ 57/437: Correct kdm theme installation and cleanup.

[Mike Gabriel]

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

sunweaver pushed a commit to branch master
in repository debian-edu-artwork.

commit fc9a7f15d46582d2a7eedc1ee5b148dc9489a4bd
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Sun Sep 3 10:37:33 2006 +0000

    Correct kdm theme installation and cleanup.
---
 debian/debian-edu-artwork.postinst | 15 +++++++++++----
 debian/debian-edu-artwork.postrm   |  8 +++-----
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/debian/debian-edu-artwork.postinst b/debian/debian-edu-artwork.postinst
index e4bce0b..a2399e7 100644
--- a/debian/debian-edu-artwork.postinst
+++ b/debian/debian-edu-artwork.postinst
@@ -24,10 +24,17 @@ change_kde_background() {
 change_kdm_theme() {
     # switch kdm theme to debian-edu
     kdmrc=/etc/kde3/kdm/kdmrc
-    echo "Installing and enabling Debian Edu KDM theme ..."
-    /usr/bin/update-ini-file $kdmrc 'X-*-Greeter' GreetString 'Debian Edu (%n)'
-    /usr/bin/update-ini-file $kdmrc 'X-*-Greeter' Theme /usr/share/apps/kdm/themes/debian-edu
-    /usr/bin/update-ini-file $kdmrc 'X-*-Greeter' UseTheme true
+    if grep -q '^UseTheme=true' $kdmrc; then
+	if grep -q '^Theme=/usr/share/apps/kdm/themes/debian-edu' $kdmrc; then
+	    echo "KDM theme for Debian Edu already enabled, not touching kdmrc."
+	else
+	    echo "KDM theme already customized, not touching kdmrc."
+	fi
+    else
+	echo "Installing and enabling Debian Edu KDM theme ..."
+	/usr/bin/update-ini-file $kdmrc 'X-*-Greeter' Theme /usr/share/apps/kdm/themes/debian-edu
+	/usr/bin/update-ini-file $kdmrc 'X-*-Greeter' UseTheme true
+    fi
 }
 
 case "$1" in
diff --git a/debian/debian-edu-artwork.postrm b/debian/debian-edu-artwork.postrm
index 9af1739..8117ca8 100644
--- a/debian/debian-edu-artwork.postrm
+++ b/debian/debian-edu-artwork.postrm
@@ -7,13 +7,11 @@ case "$1" in
   remove|deconfigure|failed-upgrade)
     # switch kdm theme away from debian-edu
     kdmrc=/etc/kde3/kdm/kdmrc
-    if grep -q '^Theme=/usr/share/apps/kdm/themes/debian-edu' $kdmrc
-	&& grep -q '^UseTheme=false' $kdmrc; then
+    if grep -q '^Theme=/usr/share/apps/kdm/themes/debian-edu' $kdmrc &&
+	grep -q '^UseTheme=true' $kdmrc; then
 
         echo "Removing and disabling Debian Edu KDM theme ..."
-
-	/usr/bin/update-ini-file /etc/kde3/kdm/kdmrc 'X-*-Greeter' GreetString 'Debian (%n)'
-	/usr/bin/update-ini-file /etc/kde3/kdm/kdmrc 'X-*-Greeter' Theme /usr/share/apps/kdm/themes/cirles
+	/usr/bin/update-ini-file /etc/kde3/kdm/kdmrc 'X-*-Greeter' Theme /usr/share/apps/kdm/themes/circles
 	/usr/bin/update-ini-file /etc/kde3/kdm/kdmrc 'X-*-Greeter' UseTheme false
     else
         echo "KDM theme customised or not enabled, not touching kdmrc ..."

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