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

[Modestas Vainius]

Author: modax-guest
Date: 2009-08-06 11:28:05 +0000 (Thu, 06 Aug 2009)
New Revision: 15533

Modified:
   trunk/packages/kdebase-workspace/debian/kdm.init
Log:
Indentation fixes.

Modified: trunk/packages/kdebase-workspace/debian/kdm.init
===================================================================
--- trunk/packages/kdebase-workspace/debian/kdm.init	2009-08-06 11:22:07 UTC (rev 15532)
+++ trunk/packages/kdebase-workspace/debian/kdm.init	2009-08-06 11:28:05 UTC (rev 15533)
@@ -42,54 +42,54 @@
 #if configuration is changed by kdmtheme or other tools, don't do magick
 if grep -q "^[[:space:]]*Theme=@@@ToBeReplacedByDesktopBase@@@" ${KDMRC}; then
 
-	KDMOVERRIDEDIR=/etc/default/kdm.d
-	KDMCFGDIR=/var/run/kdm
-	KDMCFG=$KDMCFGDIR/kdmrc
-	BACKGROUNDCFG=$KDMCFGDIR/backgroundrc
-    DEFAULT_KDM_THEME=/usr/share/kde4/apps/kdm/themes/oxygen-air
+  KDMOVERRIDEDIR=/etc/default/kdm.d
+  KDMCFGDIR=/var/run/kdm
+  KDMCFG=$KDMCFGDIR/kdmrc
+  BACKGROUNDCFG=$KDMCFGDIR/backgroundrc
+  DEFAULT_KDM_THEME=/usr/share/kde4/apps/kdm/themes/oxygen-air
 
-	test -x $DAEMON || exit 0
+  test -x $DAEMON || exit 0
 
-	# uncomment, if you want auto-logon to be runlevel-dependant
-	#test "$runlevel" || { runlevel=`runlevel`; runlevel=${runlevel#* }; }
-	#test "$runlevel" = 4 && ARG=-autolog || ARG=-noautolog
+  # uncomment, if you want auto-logon to be runlevel-dependant
+  #test "$runlevel" || { runlevel=`runlevel`; runlevel=${runlevel#* }; }
+  #test "$runlevel" = 4 && ARG=-autolog || ARG=-noautolog
 
-	# uncomment, if you want tons of debug info in your syslog
-	#ARG="$ARG -debug 255"
+  # uncomment, if you want tons of debug info in your syslog
+  #ARG="$ARG -debug 255"
 
-	# we use an alternative kdm master configuration file
-	ARG="$ARG -config $KDMCFG"
+  # we use an alternative kdm master configuration file
+  ARG="$ARG -config $KDMCFG"
 
-	# we generate kdm configuration files
-	genkdmconf --in $KDMCFGDIR 1> /dev/null
+  # we generate kdm configuration files
+  genkdmconf --in $KDMCFGDIR 1> /dev/null
 
-    if grep -q "^[[:space:]]*Wallpaper=default_blue.jpg" ${BACKGROUNDRC}; then
-        # we source overrides. run-parts sorts the list in a predictable order
-        if [ -d "$KDMOVERRIDEDIR" ]; then
-            for part in $(run-parts --list "$KDMOVERRIDEDIR" 2>/dev/null || true); do
-                . "$part"
-            done
-        fi
-
-        # we update kdm configuration files (only overridden 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" ] && [ -e "$THEME" ] && sed -i "s|^#\?Theme=.*|Theme=$THEME|" $KDMCFG
-        [ -n "$WALLPAPER" ] && [ -e "$WALLPAPER" ] && sed -i "s|^#\?Wallpaper=.*|Wallpaper=`readlink -f $WALLPAPER`|" $BACKGROUNDCFG
+  if grep -q "^[[:space:]]*Wallpaper=default_blue.jpg" ${BACKGROUNDRC}; then
+    # we source overrides. run-parts sorts the list in a predictable order
+    if [ -d "$KDMOVERRIDEDIR" ]; then
+      for part in $(run-parts --list "$KDMOVERRIDEDIR" 2>/dev/null || true); do
+        . "$part"
+      done
     fi
 
-    #usetheme is now on "by default" so we need to be sure Theme is not invalid ...
-    sed -i "s|@@@ToBeReplacedByDesktopBase@@@|$DEFAULT_KDM_THEME|" ${KDMCFG}
+    # we update kdm configuration files (only overridden 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" ] && [ -e "$THEME" ] && sed -i "s|^#\?Theme=.*|Theme=$THEME|" $KDMCFG
+    [ -n "$WALLPAPER" ] && [ -e "$WALLPAPER" ] && sed -i "s|^#\?Wallpaper=.*|Wallpaper=`readlink -f $WALLPAPER`|" $BACKGROUNDCFG
+  fi
 
-    # autologin overrides are useful for live debian environment
-    if [ -n "$AUTOLOGINUSER" ]; then
-        sed -i "s|^#\?AutoLoginEnable=.*|AutoLoginEnable=true|" $KDMCFG
-        sed -i "s|^#\?AutoLoginUser=.*|AutoLoginUser=$AUTOLOGINUSER|" $KDMCFG
-    fi
-    [ -n "$AUTOLOGINDELAY" ] && sed -i "s|^#\?AutoLoginDelay=.*|AutoLoginDelay=$AUTOLOGINDELAY|" $KDMCFG
-    [ -n "$AUTOLOGINAGAIN" ] && sed -i "s|^#\?AutoLoginAgain=.*|AutoLoginAgain=$AUTOLOGINAGAIN|" $KDMCFG
-    [ -n "$AUTOLOGINLOCKED" ] && sed -i "s|^#\?AutoLoginLocked=.*|AutoLoginLocked=$AUTOLOGINLOCKED|" $KDMCFG
+  #usetheme is now on "by default" so we need to be sure Theme is not invalid ...
+  sed -i "s|@@@ToBeReplacedByDesktopBase@@@|$DEFAULT_KDM_THEME|" ${KDMCFG}
+
+  # autologin overrides are useful for live debian environment
+  if [ -n "$AUTOLOGINUSER" ]; then
+    sed -i "s|^#\?AutoLoginEnable=.*|AutoLoginEnable=true|" $KDMCFG
+    sed -i "s|^#\?AutoLoginUser=.*|AutoLoginUser=$AUTOLOGINUSER|" $KDMCFG
+  fi
+  [ -n "$AUTOLOGINDELAY" ] && sed -i "s|^#\?AutoLoginDelay=.*|AutoLoginDelay=$AUTOLOGINDELAY|" $KDMCFG
+  [ -n "$AUTOLOGINAGAIN" ] && sed -i "s|^#\?AutoLoginAgain=.*|AutoLoginAgain=$AUTOLOGINAGAIN|" $KDMCFG
+  [ -n "$AUTOLOGINLOCKED" ] && sed -i "s|^#\?AutoLoginLocked=.*|AutoLoginLocked=$AUTOLOGINLOCKED|" $KDMCFG
 fi
 
 # If we upgraded the daemon, we can't use the --exec argument to