1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
|
$NetBSD: patch-ep,v 1.6 2005/12/11 11:01:48 markd Exp $
--- startkde.orig 2005-11-09 11:37:01.000000000 +1300
+++ startkde
@@ -48,7 +48,7 @@ fi
#
# * Then ksmserver is started which in turn starts
# 1) the window manager (kwin)
-# 2) everything in $KDEDIR/share/autostart (kdesktop, kicker, etc.)
+# 2) everything in $KDEDIR/share/kde/autostart (kdesktop, kicker, etc.)
# 3) the rest of the session.
# The user's personal KDE directory is usually ~/.kde, but this setting
@@ -60,8 +60,9 @@ test -n "$KDEHOME" && kdehome=`echo "$KD
# see kstartupconfig source for usage
mkdir -m 700 -p $kdehome
mkdir -m 700 -p $kdehome/share
-mkdir -m 700 -p $kdehome/share/config
-cat >$kdehome/share/config/startupconfigkeys <<EOF
+mkdir -m 700 -p $kdehome/share/kde
+mkdir -m 700 -p $kdehome/share/kde/config
+cat >$kdehome/share/kde/config/startupconfigkeys <<EOF
kcminputrc Mouse cursorTheme ''
kcminputrc Mouse cursorSize ''
kpersonalizerrc General FirstLogin true
@@ -76,7 +77,7 @@ kstartupconfig
if test $? -ne 0; then
xmessage -geometry 500x100 "Could not start kstartupconfig. Check your installation."
fi
-. $kdehome/share/config/startupconfig
+. $kdehome/share/kde/config/startupconfig
# XCursor mouse theme needs to be applied here to work even for kded or ksmserver
if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then
@@ -200,11 +201,11 @@ fi
if test -n "$KDEDIRS"; then
kdedirs_first=`echo "$KDEDIRS"|sed -e 's/:.*//'`
- sys_odir=$kdedirs_first/share/fonts/override
- sys_fdir=$kdedirs_first/share/fonts
+ sys_odir=$kdedirs_first/share/kde/fonts/override
+ sys_fdir=$kdedirs_first/share/kde/fonts
else
- sys_odir=$KDEDIR/share/fonts/override
- sys_fdir=$KDEDIR/share/fonts
+ sys_odir=$KDEDIR/share/kde/fonts/override
+ sys_fdir=$KDEDIR/share/kde/fonts
fi
# We run mkfontdir on the user's font dirs (if we have permission) to pick
|