blob: 27826bda2e21807dd40e4e03091194b3c33fda27 (
plain)
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
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
|
--- kdebase/startkde.ORI 2011-12-11 18:17:16.287267447 +0100
+++ kdebase/startkde 2011-12-11 18:35:05.876764598 +0100
@@ -74,39 +74,10 @@
echo "[startkde] KDEHOME is preset to $KDEHOME." 1>&2
export KDEHOME=$KDEHOME
else
- # $KDEHOME is NOT already preset in the environment. Try to help.
- # This might be overkill but does provide flexibility.
+ # $KDEHOME is NOT already preset in the environment.
+ # We always use ~/.trinity as default.
echo "[startkde] KDEHOME is not set." 1>&2
- if [ -d $HOME/.trinity ]; then
- # OK, this one is obvious.
- export KDEHOME=$HOME/.trinity
- elif [ -d $HOME/.trinity ]; then
- # Looks like the user had an old version of Trinity installed at last login
- echo "[startkde] Migrating old ~/.trinity directory to new ~/.trinity name." 1>&2
- mv $HOME/.trinity $HOME/.trinity
- export KDEHOME=$HOME/.trinity
- elif [ -f /usr/bin/kde4-config ]; then
- # Looks like KDE4 is installed.
- if [ -d $HOME/.kde ] && [ ! -d $HOME/.trinity ]; then
- # Presume $HOME/.kde is being used for KDE4 as it already exists.
- export KDEHOME=$HOME/.trinity
- else
- # Presume $HOME/.kde is being used for KDE4 to be on the safe side.
- export KDEHOME=$HOME/.trinity
- fi
- elif [ -f /opt/trinity/bin/kde-config ]; then
- # Looks like KDE3 or Trinity is installed and playing second fiddle to KDE4.
- export KDEHOME=$HOME/.trinity
- elif [ -f /opt/trinity/bin/kde-config ]; then
- # Looks like KDE3 or Trinity is installed and playing second fiddle to KDE4.
- export KDEHOME=$HOME/.trinity
- elif [ -f /usr/bin/kde-config ] && [ -d $HOME/.kde ]; then
- # Looks like KDE3 or Trinity is installed and not playing second fiddle to KDE4.
- export KDEHOME=$HOME/.kde
- else
- # Resort to this and hope for the best!
- export KDEHOME=$HOME/.trinity
- fi
+ export KDEHOME=$HOME/.trinity
echo "[startkde] Set KDEHOME to $KDEHOME." 1>&2
fi
@@ -123,43 +94,20 @@
if [ -d /opt/trinity/bin ]; then
export PATH=/opt/trinity/bin:$PATH
fi
-if [ -d /opt/trinity/games ]; then
- export PATH=/opt/trinity/games:$PATH
-fi
-if [ -d /opt/trinity/bin ]; then
- export PATH=/opt/trinity/bin:$PATH
-fi
-if [ -d /opt/trinity/share ]; then
- export XDG_DATA_DIRS=$XDG_DATA_DIRS:/opt/trinity/share/:/usr/share/
-fi
if [ -d /opt/trinity/share ]; then
- export XDG_DATA_DIRS=$XDG_DATA_DIRS:/opt/trinity/share/:/usr/share/
+ # Do NOT add /usr/share, it is supposed to be already there !
+ export XDG_DATA_DIRS=$XDG_DATA_DIRS:/opt/trinity/share/
fi
if [ -d /opt/trinity/etc/xdg ]; then
- export XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:/opt/trinity/etc/xdg/:/etc/xdg/
-fi
-if [ -d /opt/trinity/etc/xdg ]; then
- export XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:/opt/trinity/etc/xdg/:/etc/xdg/
+ # Do NOT add /etc/xdg, it is supposed to be already there !
+ export XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:/opt/trinity/etc/xdg/
fi
if [ -d /opt/trinity/share/man ]; then
export MANPATH=/opt/trinity/share/man:$MANPATH
fi
-if [ -d /opt/trinity/share/man ]; then
- export MANPATH=/opt/trinity/share/man:$MANPATH
-fi
-if [ -d /opt/trinity ]; then
- if [ -n "$KDEDIRS" ]; then
- export KDEDIRS=$KDEDIRS:/opt/trinity/:/usr/
- else
- export KDEDIRS=/opt/trinity/:/usr/
- fi
-fi
if [ -d /opt/trinity ]; then
- if [ -n "$KDEDIRS" ]; then
- export KDEDIRS=$KDEDIRS:/opt/trinity/:/usr/
- else
- export KDEDIRS=/opt/trinity/:/usr/
- fi
+ # The TDE directory should appear BEFORE '/usr' in KDEDIRS variable !
+ export KDEDIRS=${KDEDIR}/:${KDEDIRS}
fi
test -n "$KDEHOME" && kdehome=`echo "$KDEHOME" | sed "s,^~/,$HOME/,"`
|
