[debian-edu-commits] debian-edu/ 79/437: * move the code from the postinst to the update-artwork script

[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 239f4b75cb2651a6def56c3c62538e0fe1eec4a3
Author: Steffen Joeris <white at debian.org>
Date:   Fri Sep 15 05:12:36 2006 +0000

    * move the code from the postinst to the update-artwork
      script
---
 debian/changelog                   |  2 +-
 debian/debian-edu-artwork.postinst | 23 -----------------------
 debian/update-artwork              | 27 +++++++++++++++++++++++++++
 3 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 533b004..d7256d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,7 @@ debian-edu-artwork (0.0.11~1) unstable; urgency=low
     easy to modify.
 
   [ Steffen Joeris ]
-  * Add code to debian-edu-artwork.postinst to start the kde kiosk
+  * Add code to update-artwork to start the kde kiosk
     profiles for debian-edu which creates basic configuration for
     the /etc/kderc and the /etc/kde-user-profile as a mapping file
   * Install the kdesktoprc now under a default dir which can be used
diff --git a/debian/debian-edu-artwork.postinst b/debian/debian-edu-artwork.postinst
index c9bf35c..c170ffc 100644
--- a/debian/debian-edu-artwork.postinst
+++ b/debian/debian-edu-artwork.postinst
@@ -2,29 +2,6 @@
 
 set -e
 
-KIOSK_MAP_FILE="/etc/kde-user-profile"
-KIOSK_CONFIG_FILE="/etc/kderc"
-# Install the file kde-user-profile if it does not exist to ensure
-# we can use our kiosk modes
-if [ ! -e "$KIOSK_MAP_FILE" ] ; then
-	cat >> $KIOSK_MAP_FILE << EOT
-[General]
-groups=students
-
-[Groups]
-students=debian_edu_pupils
-EOT
-
-if [ ! -e "$KIOSK_CONFIG_FILE" ] ; then
-	cat >> $KIOSK_CONFIG_FILE << EOT
-[Directories]
-userProfileMapFile=/etc/kde-user-profile
-
-[Directories-debian_edu_pupils]
-ProfileDescription=Debian-Edu Profile for pupils
-prefixes=/usr/share/debian-edu-artwork/kde-profile/debian_edu_pupils
-EOT
-
 #DEBHELPER#
 
 case "$1" in
diff --git a/debian/update-artwork b/debian/update-artwork
index 2c437fb..c9c364d 100644
--- a/debian/update-artwork
+++ b/debian/update-artwork
@@ -65,10 +65,37 @@ restore_kdm_theme() {
     fi
 }
 
+activate_kiosk_profiles() {
+	KIOSK_MAP_FILE="/etc/kde-user-profile"
+	KIOSK_CONFIG_FILE="/etc/kderc"
+	# Install the file kde-user-profile if it does not exist to ensure
+	# we can use our kiosk modes
+	if [ ! -e "$KIOSK_MAP_FILE" ] ; then
+	        cat >> $KIOSK_MAP_FILE << EOT
+[General]
+groups=students
+
+[Groups]
+students=debian_edu_pupils
+EOT
+	fi
+
+	if [ ! -e "$KIOSK_CONFIG_FILE" ] ; then
+        	cat >> $KIOSK_CONFIG_FILE << EOT
+[Directories]
+userProfileMapFile=/etc/kde-user-profile
+
+[Directories-debian_edu_pupils]
+ProfileDescription=Debian-Edu Profile for pupils
+prefixes=/usr/share/debian-edu-artwork/kde-profile/debian_edu_pupils
+EOT
+	fi
+
 case "$1" in
   configure)
     change_ldm_background
     change_kdm_theme
+    activate_kiosk_profiles
     ;;
   remove)
     restore_kdm_theme

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