diff options
Diffstat (limited to 'r14-xdg-update')
| -rw-r--r-- | r14-xdg-update | 29 |
1 files changed, 23 insertions, 6 deletions
diff --git a/r14-xdg-update b/r14-xdg-update index 69f599fad..f51a81df6 100644 --- a/r14-xdg-update +++ b/r14-xdg-update @@ -3,7 +3,7 @@ # A script to perform R14.0.0 XDG compliance updates. SCRIPT_NAME="$(basename -- "$0")" -SCRIPT_VERSION=202004080 +SCRIPT_VERSION=202307100 # This script should be needed to run only once, but corner cases # and file/directory permissions could cause incomplete updates. @@ -731,7 +731,7 @@ if [ "$R14_VERSION" -lt "201310190" ]; then mv $PROFILE_DIR/share/config/kwinrulesrc $PROFILE_DIR/share/config/twinrulesrc 2>/dev/null mv $PROFILE_DIR/share/config/kwin_rules_dialogrc $PROFILE_DIR/share/config/twin_rules_dialogrc 2>/dev/null sed -i 's|PluginLib=kwin_|PluginLib=twin_|' $PROFILE_DIR/share/config/twinrc - sed -i 's|PluginLib=kwin3_|PluginLib=twin3_|' $PROFILE_DIR/share/config/twinrc + sed -i 's|PluginLib=kwin3_|PluginLib=twin_|' $PROFILE_DIR/share/config/twinrc fi fi if [ "$R14_VERSION" -lt "201309150" ]; then @@ -824,15 +824,14 @@ if [ "$R14_VERSION" -lt "201401070" ]; then mv $PROFILE_DIR/share/apps/kstyle $PROFILE_DIR/share/apps/tdestyle 2>/dev/null fi fi -if [ "$R14_VERSION" -lt "201309150" ]; then - # Copy the following two rc files rather than move because the older versions are needed for HAL systems. +if [ "$R14_VERSION" -lt "202202130" ]; then if [ ! -f $PROFILE_DIR/share/config/tdenetworkmanagerrc ] && [ -f $PROFILE_DIR/share/config/knetworkmanagerrc ]; then Log " knetworkmanager->tdenetworkmanager" - cp -a $PROFILE_DIR/share/config/knetworkmanagerrc $PROFILE_DIR/share/config/tdenetworkmanagerrc 2>/dev/null + mv $PROFILE_DIR/share/config/knetworkmanagerrc $PROFILE_DIR/share/config/tdenetworkmanagerrc 2>/dev/null fi if [ ! -f $PROFILE_DIR/share/config/tdepowersaverc ] && [ -f $PROFILE_DIR/share/config/kpowersaverc ]; then Log " kpowersave->tdepowersave" - cp -a $PROFILE_DIR/share/config/kpowersaverc $PROFILE_DIR/share/config/tdepowersaverc 2>/dev/null + mv $PROFILE_DIR/share/config/kpowersaverc $PROFILE_DIR/share/config/tdepowersaverc 2>/dev/null fi fi if [ "$R14_VERSION" -lt "201401050" ]; then @@ -1009,6 +1008,24 @@ if [ "$R14_VERSION" -lt "201811010" ]; then fi fi +# Remove Konqueror's icon cache entry for / (issue TDE/tdebase#1) +if [ "$R14_VERSION" -lt "202103280" ]; then + if [ "`grep \"\([=,]\)/,[^,\n]*[,]*\" ${PROFILE_DIR}/share/config/konq_history`" ]; then + sed -i "s|\([=,]\)/,[^,\n]*[,]*|\1|" ${PROFILE_DIR}/share/config/konq_history + Log " Removed icon cache entry for root directory (Gitea issue TDE/tdebase#1)" + fi +fi + +# Rename twin3_ to twin_ in theme config files +if [ "$R14_VERSION" -lt "202307100" ]; then + find "${PROFILE_DIR}/share/apps/tdestyle/themes/" -type f -iname "*.xml" -print0 2>/dev/null | \ + xargs -r0 sed -ri "s|twin3_|twin_|g" + if [ -f $PROFILE_DIR/share/config/twinrc ]; then + sed -i 's|PluginLib=twin3_|PluginLib=twin_|' $PROFILE_DIR/share/config/twinrc + fi + Log " Renamed twin3_ to twin_ in theme files" +fi + # Perform some nominal update validations. # First clean house from any previous failures. if [ "$CACHE_DIR" = "" ]; then |