From 3c0b2b898d8183629806bfcc827662b42d100432 Mon Sep 17 00:00:00 2001 From: Alexander Golubev Date: Thu, 4 Sep 2025 04:37:36 +0300 Subject: starttde: drop support for autouse of ~/.kde as TDEHOME The changes are loosely based on starttde proposed by @Woodsman in [1]. [1]: https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/322 Signed-off-by: Alexander Golubev --- starttde | 28 +++++----------------------- 1 file changed, 5 insertions(+), 23 deletions(-) diff --git a/starttde b/starttde index b73dafd71..5979c4872 100755 --- a/starttde +++ b/starttde @@ -178,31 +178,13 @@ fi # * Then ksmserver starts and takes control of the remainder of the # startup sequence. -# The user's personal TDE directory usually is $HOME/.trinity. -# This setting may be overridden by setting $TDEHOME. When migrating profiles -# must be careful here because $HOME/.kde was used commonly in the pre-KDE4 -# days for the user's TDE profile, but now with KDE4 common on systems, -# $HOME/.kde might point to KDE4 profile settings. The existence of KDE4 -# does not mean all people are using KDE4. - -if [ "$TDEHOME" != "" ]; then - echo "[starttde] TDEHOME is preset to $TDEHOME." 1>&2 - export TDEHOME=$TDEHOME -else - # $TDEHOME is NOT already preset in the environment. Try to help. - # This might be overkill but does provide flexibility. - # This script and kstandardirs.h and kstandardirs.cpp must match. - # The latter two must be edited/patched before compiling. - echo "[starttde] TDEHOME is not set." 1>&2 - # Default value: $HOME/.trinity. Most users will use this. +# The user's personal TDE directory usually is $HOME/.trinity. This setting +# may be overridden by setting $TDEHOME. +if [ "$TDEHOME" = "" ]; then + # Note: the default for TDEHOME must match the one in tdestandarddirs.h export TDEHOME=$HOME/.trinity - - if [ ! -d $HOME/.trinity ] && [ ! -f /usr/bin/kde4-config ] && [ "$TDEDIR" = "/usr" ] && [ -d $HOME/.kde ]; then - # Looks like Trinity is installed and not playing second fiddle to KDE4. - export TDEHOME=$HOME/.kde - fi - echo "[starttde] Set TDEHOME to $TDEHOME." 1>&2 fi +echo "[starttde] TDEHOME is set to $TDEHOME." 1>&2 # tdesu needs something to find root's TDE profile. Set the TDEROOTHOME # variable here as a last resort. /root/.trinity is a safe presumption. -- cgit v1.2.3