summaryrefslogtreecommitdiffstats
path: root/r14-xdg-update
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2013-04-18 18:28:05 -0500
committerDarrell Anderson <humanreadable@yahoo.com>2013-04-18 18:28:05 -0500
commit9f795192a5302731e3552fe311f2c4120f8b69e0 (patch)
treeb4c373c99a82312b44643aa9cbd4a41c86fafe8d /r14-xdg-update
parentc6c2468b389745987f730c59b266080b42e58f93 (diff)
downloadtdebase-9f795192a5302731e3552fe311f2c4120f8b69e0.tar.gz
tdebase-9f795192a5302731e3552fe311f2c4120f8b69e0.zip
Rename kderc -> tderc in support of bug report 1447.
Diffstat (limited to 'r14-xdg-update')
-rw-r--r--r14-xdg-update10
1 files changed, 10 insertions, 0 deletions
diff --git a/r14-xdg-update b/r14-xdg-update
index 103d5dec..627262ac 100644
--- a/r14-xdg-update
+++ b/r14-xdg-update
@@ -624,6 +624,16 @@ if [ ! -f $PROFILE_DIR/share/config/tderadiorc ] && [ -f $PROFILE_DIR/share/conf
mv $PROFILE_DIR/share/config/kradiorc $PROFILE_DIR/share/config/tderadiorc 2>/dev/null
mv $PROFILE_DIR/share/apps/kradio $PROFILE_DIR/share/apps/tderadio 2>/dev/null
fi
+if [ ! -f $HOME/.tderc ] && [ -f $HOME/.kderc ]; then
+ # Do not blindly move $HOME/.kderc because that file might be from KDE4.
+ # The first test is from a Trinity .kderc and the second test is from a KDE4 .kderc.
+ if [ "`grep selectBackground $HOME/.kderc`" != "" ] && [ "`grep smallestReadableFont $HOME/.kderc`" = "" ]; then
+ # Both tests pass. Probably a Trinity .kderc.
+ Message_Prefix
+ echo " .kderc->.tderc"
+ mv $HOME/.kderc $HOME/.tderc 2>/dev/null
+ fi
+fi
# Disable some features new to R14, otherwise users will see an unfamiliar desktop.
if [[ $($TDEDIR/bin/kreadconfig --file kickerrc --group "General" --key "ShowDeepButtons" --default false) == "false" ]]; then