summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2018-05-26 19:01:19 +0200
committerSlávek Banko <slavek.banko@axis.cz>2018-05-26 19:01:35 +0200
commit59b407d2d3165c4ecaa807d2598313ce9ea4e66a (patch)
tree89ce7ae9f2ee5bbc5a1191086e191d78d012beb9
parentebc4be41a0b70679004fd9098cdc523fe597ae0d (diff)
downloadtdebase-59b407d2d3165c4ecaa807d2598313ce9ea4e66a.tar.gz
tdebase-59b407d2d3165c4ecaa807d2598313ce9ea4e66a.zip
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> (cherry picked from commit d0a40adea0be5005132befbd5a355f592a4a35ac)
-rwxr-xr-xstarttde10
1 files changed, 4 insertions, 6 deletions
diff --git a/starttde b/starttde
index 15e776f6a..c237652c7 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