summaryrefslogtreecommitdiffstats
path: root/starttde
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2012-05-06 13:13:06 -0500
committerDarrell Anderson <humanreadable@yahoo.com>2012-05-06 13:13:06 -0500
commit68be838d5bd7da8ffa99da3e9ed521f66e2ce6ec (patch)
tree17ae2d328026d919a74e5ef831ac5b168af8d4c6 /starttde
parent3d7141e517b1419859188f253bc91e4162c18de4 (diff)
downloadtdebase-68be838d5bd7da8ffa99da3e9ed521f66e2ce6ec.tar.gz
tdebase-68be838d5bd7da8ffa99da3e9ed521f66e2ce6ec.zip
Ensure TDEDIR is exported to the environment from starttde and minor cleanup.
Diffstat (limited to 'starttde')
-rw-r--r--starttde6
1 files changed, 1 insertions, 5 deletions
diff --git a/starttde b/starttde
index 7afe77be..e387ba26 100644
--- a/starttde
+++ b/starttde
@@ -31,7 +31,7 @@ BIN_DIR="`dirname \`readlink -f $0\``"
if [ -x $BIN_DIR/konqueror ]; then
TDE_VERSION="`$BIN_DIR/konqueror --version | grep TDE | awk '{print $2}'`"
echo "[starttde] TDE version is $TDE_VERSION" 1>&2
- TDEDIR=`echo $BIN_DIR | sed 's|/bin||'`
+ export TDEDIR=${BIN_DIR%/bin}
echo "[starttde] TDE base directory is $TDEDIR" 1>&2
else
echo "[starttde] Unable to determine TDE base directory."
@@ -469,10 +469,6 @@ if test -r "$tde_fontpaths" ; then
IFS=$savifs
fi
-if [ "$TDEDIR" = "" ]; then
- export TDEDIR=`echo "$TDEDIRS" | sed -e 's/:.*//'`
-fi
-
echo "[starttde] TDEDIR: $TDEDIR" 1>&2
echo "[starttde] TDEDIRS: $TDEDIRS" 1>&2