rev 14751 - trunk/packages/kdebase-workspace/debian

[Josh Metzler]

Author: jdmetz-guest
Date: 2009-05-31 12:36:02 +0000 (Sun, 31 May 2009)
New Revision: 14751

Modified:
   trunk/packages/kdebase-workspace/debian/changelog
   trunk/packages/kdebase-workspace/debian/kdm.init
Log:
Fix grep in kdm init script to respect commented DesktopBase line.


Modified: trunk/packages/kdebase-workspace/debian/changelog
===================================================================
--- trunk/packages/kdebase-workspace/debian/changelog	2009-05-31 11:53:04 UTC (rev 14750)
+++ trunk/packages/kdebase-workspace/debian/changelog	2009-05-31 12:36:02 UTC (rev 14751)
@@ -6,6 +6,10 @@
     - plasma don't freezes when unmounting busy devices 
       (Closes: #530558, #523089)
 
+  +++ Changes by Josh Metzler:
+
+  * Fix grep for checking if Desktop Themes should be used. (Closes: #530493)
+
   +++ Changes by George Kiagiadakis:
 
   * Move the .desktop files of kcm_fonts, kcm_style and kcm_colors

Modified: trunk/packages/kdebase-workspace/debian/kdm.init
===================================================================
--- trunk/packages/kdebase-workspace/debian/kdm.init	2009-05-31 11:53:04 UTC (rev 14750)
+++ trunk/packages/kdebase-workspace/debian/kdm.init	2009-05-31 12:36:02 UTC (rev 14751)
@@ -35,7 +35,7 @@
 BACKGROUNDRC=/etc/kde4/kdm/backgroundrc
 
 #if configuration is changed by kdmtheme or other tools, don't do magick
-if grep -q "Theme=@@@ToBeReplacedByDesktopBase@@@" ${KDMRC} && grep -q "Wallpaper=default_blue.jpg" ${BACKGROUNDRC}
+if grep -q "^[[:space:]]*Theme=@@@ToBeReplacedByDesktopBase@@@" ${KDMRC} && grep -q "^[[:space:]]*Wallpaper=default_blue.jpg" ${BACKGROUNDRC}
 then
 
 KDMOVERRIDEDIR=/etc/default/kdm.d
@@ -74,7 +74,7 @@
 
 fi
 #usetheme is now on "by default" so we need to be sure that there is something ...
-if grep -q "Theme=@@@ToBeReplacedByDesktopBase@@@" ${KDMRC}
+if grep -q "^[[:space:]]*Theme=@@@ToBeReplacedByDesktopBase@@@" ${KDMRC}
 then
 	sed -i 's|@@@ToBeReplacedByDesktopBase@@@|/usr/share/kde4/apps/kdm/themes/oxygen|' ${KDMCFG}
 fi