?mode=patch&uid=2006092517251657880

Open Patch: 2006092517251657880 (by stf)

+ stf

Journal: apply me

Votecheck 'core-relaxed': Missing 1 qualified vote(s) (clifford, daja77, fake, stefanp, teha)

package/kde/kdebase/kdm.cron

package/kde/kdebase/kdebase.conf

package/kde/kdebase/postinstall.sh

Stefan Fiedler:
        kdebase: replace cron job with postinstall script
        NOT TESTED yet

Stefan Fiedler:
        kdebase: replace cron job with postinstall script
        NOT TESTED yet

--- package/kde/kdebase/kdm.cron        (Revision 16)
+++ package/kde/kdebase/kdm.cron        (Revision 17)
@@ -1,45 +0,0 @@
-#!/bin/sh
-
-confprefix=/usr/share/config/kdm/
-sessprefix=/usr/share/apps/kdm/sessions/
-
-echo "Creating kdm session scripts from ROCK wm registry ..."
-
-cat $confprefix/Xsession.pre > $confprefix/Xsession 
-
-sessions="default,failsafe"
-
-for x in /usr/share/rock-registry/wm/* ; do
-       . $x
-
-       short="`basename $x`"
-       echo -n "  $name ($short) ..."
-
-       sessions="$sessions,$short"
-
-       # adding the case entry ... damn kdm ...
-       echo -e "    $short)\n     exec $exec\n    ;;" \
-               >> $confprefix/Xsession
-       
-       # Session Types are now outside kdmrc as .desktop files
-       if [ -z "$(grep -R $(basename $exec) $sessprefix 2>/dev/null)" ] ; then
-                       cat >$sessprefix/$short.desktop <<EOS
-[Desktop Entry]
-Type=XSession
-Exec=$exec
-TryExec=$exec
-Name=$name
-EOS
-                echo " $short.desktop ..."
-     else
-                echo
-        fi
-done
-
-cat $confprefix/Xsession.post >> $confprefix/Xsession
-chmod +x $confprefix/Xsession
-
-#echo "Adapting the kdmrc ..."
-#sed "s/SessionTypes=.*/SessionTypes=$sessions/" $confprefix/kdmrc > $confprefix/kdmrc.new
-#mv $confprefix/kdmrc.new $confprefix/kdmrc
- 
--- package/kde/kdebase/kdebase.conf    (Revision 16)
+++ package/kde/kdebase/kdebase.conf    (Revision 17)
@@ -38,9 +38,6 @@
        register_xdm kdm 'KDE v3.5 display manager' $bindir/kdm
        register_wm kde 'KDE v3.5' /$prefix/bin/startkde
 
-       cp -fv $confdir/kdm.cron $root/etc/cron.daily/90-kdm
-        chmod +x $root/etc/cron.daily/90-kdm
-
        cp -fv $confdir/Xsession.* $root/$prefix/share/config/kdm/
 
        # Set's "Curser" as Konsole's default font, fixes the 
--- package/kde/kdebase/postinstall.sh  (Revision 0)
+++ package/kde/kdebase/postinstall.sh  (Revision 17)
@@ -0,0 +1,49 @@
+#!/bin/sh
+
+if any_touched "/usr/share/rock-registry/wm/" ; then
+       confprefix=/usr/share/config/kdm/
+       sessprefix=/usr/share/apps/kdm/sessions/
+       sessions="default,failsafe"
+
+       echo "Creating kdm session scripts from ROCK wm registry ..."
+
+       cat $confprefix/Xsession.pre > $confprefix/Xsession
+
+       for x in /usr/share/rock-registry/wm/* ; do
+               [ -f "$x" ] || continue
+               . $x
+
+               short="`basename $x`"
+               echo -n "  $name ($short) ..."
+
+               sessions="$sessions,$short"
+
+               # adding the case entry ... damn kdm ...
+               echo -e "    $short)\n     exec $exec\n    ;;" \
+                       >> $confprefix/Xsession
+       
+               # Session Types are now outside kdmrc as .desktop files
+               if [ -z "$(grep -R $(basename $exec) $sessprefix 2>/dev/null)" ] ; then
+                               cat >$sessprefix/$short.desktop <<EOS
+[Desktop Entry]
+Type=XSession
+Exec=$exec
+TryExec=$exec
+Name=$name
+EOS
+                       echo " $short.desktop ..."
+               else
+                       echo
+               fi
+       done
+
+       cat $confprefix/Xsession.post >> $confprefix/Xsession
+       chmod +x $confprefix/Xsession
+
+       unset x confprefix sessprefix sessions
+fi
+
+#echo "Adapting the kdmrc ..."
+#sed "s/SessionTypes=.*/SessionTypes=$sessions/" $confprefix/kdmrc > $confprefix/kdmrc.new
+#mv $confprefix/kdmrc.new $confprefix/kdmrc
+ 

[Download this patch]