diff options
| author | Alexander Golubev <fatzer2@gmail.com> | 2025-09-04 04:37:36 +0300 |
|---|---|---|
| committer | Alexander Golubev <fatzer2@gmail.com> | 2025-10-24 17:15:30 +0300 |
| commit | ff06d2b2a65756050ab8f651529c430b328a2b3b (patch) | |
| tree | 0797b88ff33f3e19dd81368c789fc0aa64aebf0e | |
| parent | a53681f35e65dd364c0b9fa608f5d2d99fadaebc (diff) | |
| download | tdebase-ff06d2b2.tar.gz tdebase-ff06d2b2.zip | |
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 <fatzer2@gmail.com>
(cherry picked from commit 3c0b2b898d8183629806bfcc827662b42d100432)
| -rwxr-xr-x | starttde | 28 |
1 files changed, 5 insertions, 23 deletions
@@ -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. |