Browse Source

Fixed KMail Address book rename (kabc -> tdeabc). This resolves bug 2272.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

(cherry picked from commit 0537ed938f)
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/182/head
Michele Calgaro 8 years ago
parent
commit
bf9a6778f3
  1. 9
      r14-xdg-update
  2. 1
      starttde

9
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

1
starttde

@ -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

Loading…
Cancel
Save