rev 5088 - trunk/packages/kdebase/debian

[Fathi Boudra]

Author: fboudra-guest
Date: 2006-12-07 11:31:42 +0100 (Thu, 07 Dec 2006)
New Revision: 5088

Modified:
   trunk/packages/kdebase/debian/kdm.init
Log:
simplification. Thks pusling ;)

Modified: trunk/packages/kdebase/debian/kdm.init
===================================================================
--- trunk/packages/kdebase/debian/kdm.init	2006-12-07 09:24:22 UTC (rev 5087)
+++ trunk/packages/kdebase/debian/kdm.init	2006-12-07 10:31:42 UTC (rev 5088)
@@ -34,13 +34,6 @@
 KDMCFGDIR=/var/run/kdm
 KDMCFG=$KDMCFGDIR/kdmrc
 
-# initialize with default values
-USEBACKGROUND=`grep '^UseBackground=' $KDMRC | cut -f2 -d '='`
-BACKGROUNDCFG=$KDMCFGDIR/backgroundrc
-USETHEME=`grep '^UseTheme=' $KDMRC | cut -f2 -d '='`
-THEME=`grep '^Theme=' $KDMRC | cut -f2 -d '='`
-WALLPAPER=`grep -m1 '^Wallpaper=' $BACKGROUNDRC | cut -f2 -d '='`
-
 test -x $DAEMON || exit 0
 
 # uncomment, if you want auto-logon to be runlevel-dependant
@@ -63,12 +56,12 @@
 # we generate kdm configuration files
 genkdmconf --in $KDMCFGDIR 1> /dev/null
 
-# we update kdm configuration files
-sed -i "s|^UseBackground=.*|UseBackground=$USEBACKGROUND|" $KDMCFG
-sed -i "s|^BackgroundCfg=.*|BackgroundCfg=$BACKGROUNDCFG|" $KDMCFG
-sed -i "s|^UseTheme=.*|UseTheme=$USETHEME|" $KDMCFG
-sed -i "s|^Theme=.*|Theme=$THEME|" $KDMCFG
-sed -i "s|^Wallpaper=.*|Wallpaper=$WALLPAPER|" $BACKGROUNDCFG
+# we update kdm configuration files (only overrided values)
+[ -n "$USEBACKGROUND" ] && sed -i "s|^UseBackground=.*|UseBackground=$USEBACKGROUND|" $KDMCFG
+[ -n "$BACKGROUNDCFG" ] && sed -i "s|^BackgroundCfg=.*|BackgroundCfg=$BACKGROUNDCFG|" $KDMCFG
+[ -n "$USETHEME" ] && sed -i "s|^UseTheme=.*|UseTheme=$USETHEME|" $KDMCFG
+[ -n "$THEME" ] && sed -i "s|^Theme=.*|Theme=$THEME|" $KDMCFG
+[ -n "$WALLPAPER" ] && sed -i "s|^Wallpaper=.*|Wallpaper=$WALLPAPER|" $BACKGROUNDCFG
 
 # uncomment, if you want auto-logon to be runlevel-dependant
 #test "$runlevel" || { runlevel=`runlevel`; runlevel=${runlevel#* }; }