diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2014-12-27 15:34:14 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2014-12-27 15:36:27 +0900 |
| commit | bf9a6778f3d34c3f2deb93ae600376ec9cf4b18e (patch) | |
| tree | a94ac8244e5d3b09bb68a0a0b67dc92f03b0311f | |
| parent | 8d45faf70beff57232aac00439907e204a23b35f (diff) | |
| download | tdebase-bf9a6778f3d34c3f2deb93ae600376ec9cf4b18e.tar.gz tdebase-bf9a6778f3d34c3f2deb93ae600376ec9cf4b18e.zip | |
Fixed KMail Address book rename (kabc -> tdeabc). This resolves bug 2272.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 0537ed938f82768c5b0aff88daf7eff620c743bf)
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
| -rw-r--r-- | r14-xdg-update | 9 | ||||
| -rwxr-xr-x | starttde | 1 |
2 files changed, 9 insertions, 1 deletions
diff --git a/r14-xdg-update b/r14-xdg-update index edae0ca20..86d42938e 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=201412080 +SCRIPT_VERSION=201412270 # This script should be needed to run only once, but corner cases # and file/directory permissions could cause incomplete updates. @@ -940,6 +940,13 @@ if [ "$R14_VERSION" -lt "201309150" ]; then fi fi +if [ "$R14_VERSION" -lt "201412270" ]; then + if [ ! -d $PROFILE_DIR/share/apps/tdeabc ] && [ -d $PROFILE_DIR/share/apps/kabc ]; then + Log " kabc->tdeabc" + mv $PROFILE_DIR/share/apps/kabc $PROFILE_DIR/share/apps/tdeabc 2>/dev/null + fi +fi + # Perform some nominal update validations. # First clean house from any previous failures. if [ "$CACHE_DIR" = "" ]; then @@ -326,6 +326,7 @@ if [ -d "$tdehome" ]; then fi if [ "$R14_UPDATED" != "true" ] || [ "$R14_VERSION" -lt "$R14_SCRIPT" ]; then if [ -e $TDEDIR/bin/r14-xdg-update ]; then + echo "[starttde] Running $TDEDIR/bin/r14-xdg-update script." 1>&2 sh $TDEDIR/bin/r14-xdg-update EXIT_CODE="$?" else |