summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2018-05-26 17:01:19 (GMT)
committer Slávek Banko <slavek.banko@axis.cz>2018-05-26 17:01:19 (GMT)
commitd0a40adea0be5005132befbd5a355f592a4a35ac (patch)
tree76a355c245b6ee09b2adc8f151a7922a72947f1c
parent67290ac0ad24d8db32bd079c65746b5244215618 (diff)
downloadtdebase-d0a40ade.zip
tdebase-d0a40ade.tar.gz
starttde: Always add paths because folders can be created
by installing packages during a session. This resolves bug 2395 Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rwxr-xr-xstarttde10
1 files changed, 4 insertions, 6 deletions
diff --git a/starttde b/starttde
index 15e776f..c237652 100755
--- a/starttde
+++ b/starttde
@@ -177,7 +177,7 @@ if [ "$TDEROOTHOME" = "" ]; then
fi
# Modify the following environment variables only as necessary.
-if [ -d $TDEDIR/games ]; then
+
if ! is_in_path PATH "$TDEDIR/games" ; then
# Respect the traditional path order. Don't blindly place $TDEDIR/games
# first in the path. Only place $TDEDIR/games before /usr/games. If packagers
@@ -191,8 +191,7 @@ if [ -d $TDEDIR/games ]; then
export PATH=$TDEDIR/games:$PATH
fi
fi
-fi
-if [ -d $TDEDIR/bin ]; then
+
if ! is_in_path PATH "$TDEDIR/bin" ]; then
# Respect the traditional path order. Don't blindly place $TDEDIR/bin
# first in the path. Only place $TDEDIR/bin before /usr/bin. This order is
@@ -206,8 +205,7 @@ if [ -d $TDEDIR/bin ]; then
export PATH=$TDEDIR/bin:$PATH
fi
fi
-fi
-if [ -d $TDEDIR/share/man ]; then
+
if [ -x /usr/bin/manpath ]; then
if [ "`manpath 2>/dev/null | grep \"$TDEDIR/share/man\"`" = "" ]; then
export MANPATH=$TDEDIR/share/man:$MANPATH
@@ -217,7 +215,7 @@ if [ -d $TDEDIR/share/man ]; then
export MANPATH=$TDEDIR/share/man:$MANPATH
fi
fi
-fi
+
if [ "$XDG_CONFIG_DIRS" = "" ]; then
if [ -d /etc/xdg ]; then