|
Lines 74-112
Link Here
|
| 74 |
echo "[startkde] KDEHOME is preset to $KDEHOME." 1>&2 |
74 |
echo "[startkde] KDEHOME is preset to $KDEHOME." 1>&2 |
| 75 |
export KDEHOME=$KDEHOME |
75 |
export KDEHOME=$KDEHOME |
| 76 |
else |
76 |
else |
| 77 |
# $KDEHOME is NOT already preset in the environment. Try to help. |
77 |
# $KDEHOME is NOT already preset in the environment. |
| 78 |
# This might be overkill but does provide flexibility. |
78 |
# We always use ~/.trinity as default. |
| 79 |
echo "[startkde] KDEHOME is not set." 1>&2 |
79 |
echo "[startkde] KDEHOME is not set." 1>&2 |
| 80 |
if [ -d $HOME/.trinity ]; then |
80 |
export KDEHOME=$HOME/.trinity |
| 81 |
# OK, this one is obvious. |
|
|
| 82 |
export KDEHOME=$HOME/.trinity |
| 83 |
elif [ -d $HOME/.trinity ]; then |
| 84 |
# Looks like the user had an old version of Trinity installed at last login |
| 85 |
echo "[startkde] Migrating old ~/.trinity directory to new ~/.trinity name." 1>&2 |
| 86 |
mv $HOME/.trinity $HOME/.trinity |
| 87 |
export KDEHOME=$HOME/.trinity |
| 88 |
elif [ -f /usr/bin/kde4-config ]; then |
| 89 |
# Looks like KDE4 is installed. |
| 90 |
if [ -d $HOME/.kde ] && [ ! -d $HOME/.trinity ]; then |
| 91 |
# Presume $HOME/.kde is being used for KDE4 as it already exists. |
| 92 |
export KDEHOME=$HOME/.trinity |
| 93 |
else |
| 94 |
# Presume $HOME/.kde is being used for KDE4 to be on the safe side. |
| 95 |
export KDEHOME=$HOME/.trinity |
| 96 |
fi |
| 97 |
elif [ -f /opt/trinity/bin/kde-config ]; then |
| 98 |
# Looks like KDE3 or Trinity is installed and playing second fiddle to KDE4. |
| 99 |
export KDEHOME=$HOME/.trinity |
| 100 |
elif [ -f /opt/trinity/bin/kde-config ]; then |
| 101 |
# Looks like KDE3 or Trinity is installed and playing second fiddle to KDE4. |
| 102 |
export KDEHOME=$HOME/.trinity |
| 103 |
elif [ -f /usr/bin/kde-config ] && [ -d $HOME/.kde ]; then |
| 104 |
# Looks like KDE3 or Trinity is installed and not playing second fiddle to KDE4. |
| 105 |
export KDEHOME=$HOME/.kde |
| 106 |
else |
| 107 |
# Resort to this and hope for the best! |
| 108 |
export KDEHOME=$HOME/.trinity |
| 109 |
fi |
| 110 |
echo "[startkde] Set KDEHOME to $KDEHOME." 1>&2 |
81 |
echo "[startkde] Set KDEHOME to $KDEHOME." 1>&2 |
| 111 |
fi |
82 |
fi |
| 112 |
|
83 |
|
|
Lines 123-165
Link Here
|
| 123 |
if [ -d /opt/trinity/bin ]; then |
94 |
if [ -d /opt/trinity/bin ]; then |
| 124 |
export PATH=/opt/trinity/bin:$PATH |
95 |
export PATH=/opt/trinity/bin:$PATH |
| 125 |
fi |
96 |
fi |
| 126 |
if [ -d /opt/trinity/games ]; then |
|
|
| 127 |
export PATH=/opt/trinity/games:$PATH |
| 128 |
fi |
| 129 |
if [ -d /opt/trinity/bin ]; then |
| 130 |
export PATH=/opt/trinity/bin:$PATH |
| 131 |
fi |
| 132 |
if [ -d /opt/trinity/share ]; then |
| 133 |
export XDG_DATA_DIRS=$XDG_DATA_DIRS:/opt/trinity/share/:/usr/share/ |
| 134 |
fi |
| 135 |
if [ -d /opt/trinity/share ]; then |
97 |
if [ -d /opt/trinity/share ]; then |
| 136 |
export XDG_DATA_DIRS=$XDG_DATA_DIRS:/opt/trinity/share/:/usr/share/ |
98 |
# Do NOT add /usr/share, it is supposed to be already there ! |
|
|
99 |
export XDG_DATA_DIRS=$XDG_DATA_DIRS:/opt/trinity/share/ |
| 137 |
fi |
100 |
fi |
| 138 |
if [ -d /opt/trinity/etc/xdg ]; then |
101 |
if [ -d /opt/trinity/etc/xdg ]; then |
| 139 |
export XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:/opt/trinity/etc/xdg/:/etc/xdg/ |
102 |
# Do NOT add /etc/xdg, it is supposed to be already there ! |
| 140 |
fi |
103 |
export XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:/opt/trinity/etc/xdg/ |
| 141 |
if [ -d /opt/trinity/etc/xdg ]; then |
|
|
| 142 |
export XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:/opt/trinity/etc/xdg/:/etc/xdg/ |
| 143 |
fi |
104 |
fi |
| 144 |
if [ -d /opt/trinity/share/man ]; then |
105 |
if [ -d /opt/trinity/share/man ]; then |
| 145 |
export MANPATH=/opt/trinity/share/man:$MANPATH |
106 |
export MANPATH=/opt/trinity/share/man:$MANPATH |
| 146 |
fi |
107 |
fi |
| 147 |
if [ -d /opt/trinity/share/man ]; then |
|
|
| 148 |
export MANPATH=/opt/trinity/share/man:$MANPATH |
| 149 |
fi |
| 150 |
if [ -d /opt/trinity ]; then |
| 151 |
if [ -n "$KDEDIRS" ]; then |
| 152 |
export KDEDIRS=$KDEDIRS:/opt/trinity/:/usr/ |
| 153 |
else |
| 154 |
export KDEDIRS=/opt/trinity/:/usr/ |
| 155 |
fi |
| 156 |
fi |
| 157 |
if [ -d /opt/trinity ]; then |
108 |
if [ -d /opt/trinity ]; then |
| 158 |
if [ -n "$KDEDIRS" ]; then |
109 |
# The TDE directory should appear BEFORE '/usr' in KDEDIRS variable ! |
| 159 |
export KDEDIRS=$KDEDIRS:/opt/trinity/:/usr/ |
110 |
export KDEDIRS=${KDEDIR}/:${KDEDIRS} |
| 160 |
else |
|
|
| 161 |
export KDEDIRS=/opt/trinity/:/usr/ |
| 162 |
fi |
| 163 |
fi |
111 |
fi |
| 164 |
|
112 |
|
| 165 |
test -n "$KDEHOME" && kdehome=`echo "$KDEHOME" | sed "s,^~/,$HOME/,"` |
113 |
test -n "$KDEHOME" && kdehome=`echo "$KDEHOME" | sed "s,^~/,$HOME/,"` |