diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2012-05-06 13:13:06 -0500 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-06-03 03:27:23 +0200 |
| commit | aaffef4117fb9103c5b60f467f49aaa97a4d9635 (patch) | |
| tree | 99367fa465c9373b8ca82ba99883a46cb1e97cfc | |
| parent | 693260990ae88e36e8c0774d64ba28c42d7d92c5 (diff) | |
| download | tdebase-aaffef4117fb9103c5b60f467f49aaa97a4d9635.tar.gz tdebase-aaffef4117fb9103c5b60f467f49aaa97a4d9635.zip | |
Ensure KDEDIR is exported to the environment from startkde and minor cleanup.
(cherry picked from commit 68be838d5bd7da8ffa99da3e9ed521f66e2ce6ec)
| -rw-r--r-- | startkde | 6 |
1 files changed, 1 insertions, 5 deletions
@@ -31,7 +31,7 @@ BIN_DIR="`dirname \`readlink -f $0\``" if [ -x $BIN_DIR/konqueror ]; then KDE_VERSION="`$BIN_DIR/konqueror --version | grep KDE | awk '{print $2}'`" echo "[startkde] TDE version is $KDE_VERSION" 1>&2 - KDEDIR=`echo $BIN_DIR | sed 's|/bin||'` + export KDEDIR=${BIN_DIR%/bin} echo "[startkde] TDE base directory is $KDEDIR" 1>&2 else echo "[startkde] Unable to determine TDE base directory." @@ -479,10 +479,6 @@ if test -r "$kde_fontpaths" ; then IFS=$savifs fi -if [ "$KDEDIR" = "" ]; then - export KDEDIR=`echo "$KDEDIRS" | sed -e 's/:.*//'` -fi - echo "[startkde] KDEDIR: $KDEDIR" 1>&2 echo "[startkde] KDEDIRS: $KDEDIRS" 1>&2 |