diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-04-19 12:51:39 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-04-19 12:51:39 -0500 |
| commit | b8ed19a4c246bf279217c6f6e8abc8ed26a6a973 (patch) | |
| tree | db7ccf39acfa1795dea0b325ec20b53051773fa9 /r14-xdg-update | |
| parent | 5f4287e56dd5c1feecc08843aae1d4e4b8835d1e (diff) | |
| parent | 3dacd27ea08799f126c00fc93358e0b3961a3b1a (diff) | |
| download | tdebase-b8ed19a4c246bf279217c6f6e8abc8ed26a6a973.tar.gz tdebase-b8ed19a4c246bf279217c6f6e8abc8ed26a6a973.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase
Diffstat (limited to 'r14-xdg-update')
| -rw-r--r-- | r14-xdg-update | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/r14-xdg-update b/r14-xdg-update index 103d5dec3..627262ac4 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 |