From 0ab8ac0ae998af9c62ea705686dcfec7d063a667 Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Tue, 5 Mar 2013 09:46:52 -0600 Subject: Update starttde script to force run r14-xdg-update against the latest renaming changes. --- starttde | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/starttde b/starttde index 7106efa4b..c11957f44 100644 --- a/starttde +++ b/starttde @@ -257,15 +257,29 @@ test -n "$TDEHOME" && tdehome=`echo "$TDEHOME" | sed "s,^~/,$HOME/,"` export DESKTOP_SESSION=trinity if [ -d "$tdehome" ]; then - # Possibly run some R14 XDG compliance updates. + # Run some R14 updates. R14_UPDATED="`$TDEDIR/bin/kreadconfig --file kdeglobals --group "R14 XDG Updates" --key Updated`" + if [ "$R14_UPDATED" = "true" ]; then + # There were massive renaming changes long after the original XDG renaming changes. + # The r14-xdg-update script needs to be run again to ensure users have many rc + # config files renamed. So despite the key Updated=true we run the script again with + # to make those changes for the user. Otherwise strange things happen. We select + # some rc config files that will be created automatically under the new changes. + # If those rc files do not exist then we presume the r14-xdg-update script needs to be + # run again. There is no harm in running the script multiple times. + if [ ! -f $TDEHOME/share/config/tdeconf_updaterc ] || [ ! -f $TDEHOME/share/config/tdelaunchrc ]; then + R14_UPDATED="false" + fi + else + R14_UPDATED="false" + fi if [ "$R14_UPDATED" != "true" ]; then if [ -e $TDEDIR/bin/r14-xdg-update ]; then sh $TDEDIR/bin/r14-xdg-update EXIT_CODE="$?" else echo "[starttde] $TDEDIR/bin/r14-xdg-update does not exist." 1>&2 - echo " Unable to perform a profile update for Trinity release R14 XDG compliance." + echo " Unable to perform a profile update for Trinity release R14." fi if [ "$EXIT_CODE" != "0" ]; then exit 1 -- cgit v1.2.1