From 77165c2ec87cfc41b7cf0941b714a36d7b7ef882 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Sat, 5 Jul 2014 16:51:39 +0200
Subject: Update r14-xdg-update: add renaming kde- => tde- in Favorites and
 FirstSeenApps in kickerrc

---
 r14-xdg-update | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/r14-xdg-update b/r14-xdg-update
index 7e00c2f12..ee7d6c93d 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 \`readlink -f $0\``"
-SCRIPT_VERSION=201403020
+SCRIPT_VERSION=201407050
 
 # This script should be needed to run only once, but corner cases
 # and file/directory permissions could cause incomplete updates.
@@ -379,14 +379,13 @@ if [ "$R14_VERSION" -lt "201309150" ]; then
 fi
 
 # Preserve kicker/panel icons.
-if [ "$R14_VERSION" -lt "201309150" ]; then
+if [ "$R14_VERSION" -lt "201407050" ]; then
   if [ -r $PROFILE_DIR/share/config/kickerrc ]; then
     Log "Updating kicker/panel customizations in kickerrc."
-    if [ -r "$PROFILE_DIR/share/config/kickerrc" ]; then
-      sed -i 's|StorageId\[\$e\]=kde-|StorageId\[\$e\]=tde-|g' "$PROFILE_DIR/share/config/kickerrc" 2>/dev/null
-    else
-      Log "kickerrc does not exist."
-    fi
+    sed -i 's|StorageId\[\$e\]=kde-|StorageId\[\$e\]=tde-|g' "$PROFILE_DIR/share/config/kickerrc" 2>/dev/null
+    sed -i '/^\(Favorites\|FirstSeenApps\)/s|\([=,]\)kde-|\1tde-|gp' "$PROFILE_DIR/share/config/kickerrc" 2>/dev/null
+  else
+    Log "kickerrc does not exist."
   fi
 fi
 if [ "$R14_VERSION" -lt "201309150" ]; then
-- 
cgit v1.2.1