[Cooker] KDEHOME in startkde

[David Walser]

OK, here's the patch (attached). *please* apply

__________________________________________________
Do you Yahoo!?
Y! Web Hosting - Let the expert host your web site
http://webhosting.yahoo.com/
--- /usr/bin/startkde~	2002-10-23 07:46:18.000000000 -0400
+++ /usr/bin/startkde	2002-10-25 10:03:01.000000000 -0400
@@ -30,15 +30,21 @@
 # people's heads. We use colours from the standard KDE palette for those with
 # palettised displays.
 
+# The user's personal KDE directory is usually ~/.kde, but this setting
+# may be overridden by setting KDEHOME.
+
+kdehome=$HOME/.kde
+test -n "$KDEHOME" && kdehome=`echo "$KDEHOME"|sed "s,^\~/,$HOME/,"`
+
 #test "$XDM_MANAGED" || bkg="-solid #C0C0C0"
 #xsetroot -cursor_name left_ptr $bkg
-if [ ! -d $HOME/.kde/share/config ] ; then
-   mkdir -p $HOME/.kde/share/config
+if [ ! -d $kdehome/share/config ] ; then
+   mkdir -p $kdehome/share/config
 fi
 
-if [ ! -e /dev/dsp ] && [ ! -e $HOME/.kde/share/config/kcmartsrc ] ; then
-   echo "[Arts]" > $HOME/.kde/share/config/kcmartsrc
-   echo "StartServer=false" >> $HOME/.kde/share/config/kcmartsrc
+if [ ! -e /dev/dsp ] && [ ! -e $kdehome/share/config/kcmartsrc ] ; then
+   echo "[Arts]" > $kdehome/share/config/kcmartsrc
+   echo "StartServer=false" >> $kdehome/share/config/kcmartsrc
 fi
 
 if [ "`whoami`" = root ] ; then
@@ -73,22 +79,22 @@
           mkdir -p ~/Desktop/ ;
    fi
 
-   if [ ! -d ~/.kde/Autostart/ ] ; then
-          mkdir -p ~/.kde/Autostart/ ;
+   if [ ! -d $kdehome/Autostart/ ] ; then
+          mkdir -p $kdehome/Autostart/ ;
    fi
 
-   if [ -e ~/.drakfw ] && [ "$(cat ~/.kde/share/apps/konqueror/bookmarks.xml | wc -l | awk '{print $1}')" = "1" ] ; then
-       cp -f /usr/share/mdk/kde/bookmarks.xml ~/.kde/share/apps/konqueror/
-       perl -pi -e "/\[KonqMainWindow Toolbar bookmarkToolBar\]/ .. /^\s*$/ and s/Hidden=true/Hidden=false/" ~/.kde/share/config/konquerorrc
+   if [ -e ~/.drakfw ] && [ "$(cat $kdehome/share/apps/konqueror/bookmarks.xml | wc -l | awk '{print $1}')" = "1" ] ; then
+       cp -f /usr/share/mdk/kde/bookmarks.xml $kdehome/share/apps/konqueror/
+       perl -pi -e "/\[KonqMainWindow Toolbar bookmarkToolBar\]/ .. /^\s*$/ and s/Hidden=true/Hidden=false/" $kdehome/share/config/konquerorrc
    fi
 
-   if [ ! -d ~/.kde/share/apps/konqueror ] ; then
-           mkdir -p ~/.kde/share/apps/konqueror/ && cp /usr/share/mdk/kde/bookmarks.xml ~/.kde/share/apps/konqueror/
+   if [ ! -d $kdehome/share/apps/konqueror ] ; then
+           mkdir -p $kdehome/share/apps/konqueror/ && cp /usr/share/mdk/kde/bookmarks.xml $kdehome/share/apps/konqueror/
    fi
 
    if [ ! -e ~/Desktop/.ArrangeIcons ] ; then
-          cp /usr/share/mdk/kde/ArangeIcons.desktop ~/.kde/Autostart/ && touch ~/Desktop/.ArrangeIcons
-   else rm -f ~/.kde/Autostart/ArangeIcons.desktop
+          cp /usr/share/mdk/kde/ArangeIcons.desktop $kdehome/Autostart/ && touch ~/Desktop/.ArrangeIcons
+   else rm -f $kdehome/Autostart/ArangeIcons.desktop
    fi
 
    #/usr/bin/kdesktop-links > /dev/null 2>&1
@@ -106,13 +112,6 @@
 #   /usr/bin/nspluginscan
 #fi
 
-
-# The user's personal KDE directory is usually ~/.kde, but this setting
-# may be overridden by setting KDEHOME.
-
-kdehome=$HOME/.kde
-test -n "$KDEHOME" && kdehome=`echo "$KDEHOME"|sed "s,^\~/,$HOME/,"`
-
 # Activate the kde font directories.
 #
 # There are 4 directories that may be used for supplying fonts for KDE.