Attachment #2394 for bug #2105

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 2105
Collapse All | Expand All




# A script to perform R14.0.0 XDG compliance updates.

SCRIPT_NAME="`basename \`readlink -f $0\``"
SCRIPT_VERSION=201412080

# This script should be needed to run only once, but corner cases
# and file/directory permissions could cause incomplete updates.

  fi
fi

# Get directories for temporary files
# All three directories are for temporary files. The cache directory is
# intended for persistent temporary data (is expected to remain across reboots
# and shutdowns). The other two directories are for non-persistent data and
# can be deleted across reboots and shutdowns.
CACHE_DIR="`readlink $PROFILE_DIR/cache-\`uname -n\``"
SOCKET_DIR="`readlink $PROFILE_DIR/socket-\`uname -n\``"
TMP_DIR="`readlink $PROFILE_DIR/tmp-\`uname -n\``"

if [ "$R14_VERSION" -lt "201309150" ]; then
  Log "Updating temp file locations."
  # All three directories are for temporary files. The cache directory is
  # intended for persistent temporary data (is expected to remain across reboots
  # and shutdowns). The other two directories are for non-persistent data and
  # can be deleted across reboots and shutdowns.
  CACHE_DIR="`readlink $PROFILE_DIR/cache-\`uname -n\``"
  SOCKET_DIR="`readlink $PROFILE_DIR/socket-\`uname -n\``"
  TMP_DIR="`readlink $PROFILE_DIR/tmp-\`uname -n\``"
  # Delete the non-persistent temporary directories. This is safe at any time.
  unlink $PROFILE_DIR/socket-`uname -n` 2>/dev/null
  unlink $PROFILE_DIR/tmp-`uname -n` 2>/dev/null

  fi
fi

if [ "$R14_VERSION" -lt "201412080" ]; then
  Log "Updating references of temporary paths."
  # Get base for temporary directories
  if [ "$CACHE_DIR" = "" ]; then
    CACHE_BASE_DIR=/var/tmp
  else
    CACHE_BASE_DIR=`dirname $CACHE_DIR`
  fi
  if [ "$SOCKET_DIR" = "" ]; then
    SOCKET_BASE_DIR=/tmp
  else
    SOCKET_BASE_DIR=`dirname $SOCKET_DIR`
  fi
  if [ "$TMP_DIR" = "" ]; then
    TMP_BASE_DIR=/tmp
  else
    TMP_BASE_DIR=`dirname $TMP_DIR`
  fi
  # Exclude user data files --- we don't want to touch those files.
  find "$PROFILE_DIR" \
       -path $PROFILE_DIR/share/apps/amarok/albumcovers -prune -o \
       -path $PROFILE_DIR/share/apps/basket/baskets -prune -o \
       -path $PROFILE_DIR/share/apps/juk/covers -prune -o \
       -path $PROFILE_DIR/share/apps/kget/logs -prune -o \
       -path $PROFILE_DIR/share/apps/kmail/autosave -prune -o \
       -path $PROFILE_DIR/share/apps/kmail/dimap -prune -o \
       -path $PROFILE_DIR/share/apps/kmail/imap -prune -o \
       -path $PROFILE_DIR/share/apps/kmail/mail -prune -o \
       -path $PROFILE_DIR/share/apps/kmail/search -prune -o \
       -path $PROFILE_DIR/share/apps/knotes -prune -o \
       -path $PROFILE_DIR/share/apps/kopete/logs -prune -o \
       -type f -print0 2>/dev/null | \
    xargs -r0 grep -ZIEl "($TMP_BASE_DIR/kde|$SOCKET_BASE_DIR/ksocket|$CACHE_BASE_DIR/kde[0-9]*cache)-" | \
    xargs -r0 sed -ri -e "s|$TMP_BASE_DIR/kde-|$TMP_BASDE_DIR/tde-|g" \
                      -e "s|$SOCKET_BASE_DIR/ksocket-|$SOCKET_BASE_DIR/tdesocket-|g" \
                      -e "s|$CACHE_BASE_DIR/kde[0-9]*cache-|$CACHE_BASE_DIR/tdecache-|g"
  # Cleanup variables
  unset CACHE_BASE_DIR
  unset SOCKET_BASE_DIR
  unset TMP_BASE_DIR
fi
if [ "$R14_VERSION" -lt "201309150" ]; then
  Log "Updating references of $TDEDIR/share/applications/kde to share/applications/tde."
  # Exclude KMail mail files --- we don't want to touch those files.

Return to bug 2105

Lines 3-9 Link Here

(-)a/r14-xdg-update (-8 / +51 lines)
3	# A script to perform R14.0.0 XDG compliance updates.	3	# A script to perform R14.0.0 XDG compliance updates.
4		4
5	SCRIPT_NAME="`basename \`readlink -f $0\``"	5	SCRIPT_NAME="`basename \`readlink -f $0\``"
6	SCRIPT_VERSION=201411240	6	SCRIPT_VERSION=201412080
7		7
8	# This script should be needed to run only once, but corner cases	8	# This script should be needed to run only once, but corner cases
9	# and file/directory permissions could cause incomplete updates.	9	# and file/directory permissions could cause incomplete updates.
Lines 269-283 if [ "$USER_DIR" = "$HOME" ]; then Link Here
269	fi	269	fi
270	fi	270	fi
271		271
		272	# Get directories for temporary files
		273	# All three directories are for temporary files. The cache directory is
		274	# intended for persistent temporary data (is expected to remain across reboots
		275	# and shutdowns). The other two directories are for non-persistent data and
		276	# can be deleted across reboots and shutdowns.
		277	CACHE_DIR="`readlink $PROFILE_DIR/cache-\`uname -n\``"
		278	SOCKET_DIR="`readlink $PROFILE_DIR/socket-\`uname -n\``"
		279	TMP_DIR="`readlink $PROFILE_DIR/tmp-\`uname -n\``"
		280
272	if [ "$R14_VERSION" -lt "201309150" ]; then	281	if [ "$R14_VERSION" -lt "201309150" ]; then
273	Log "Updating temp file locations."	282	Log "Updating temp file locations."
274	# All three directories are for temporary files. The cache directory is
275	# intended for persistent temporary data (is expected to remain across reboots
276	# and shutdowns). The other two directories are for non-persistent data and
277	# can be deleted across reboots and shutdowns.
278	CACHE_DIR="`readlink $PROFILE_DIR/cache-\`uname -n\``"
279	SOCKET_DIR="`readlink $PROFILE_DIR/socket-\`uname -n\``"
280	TMP_DIR="`readlink $PROFILE_DIR/tmp-\`uname -n\``"
281	# Delete the non-persistent temporary directories. This is safe at any time.	283	# Delete the non-persistent temporary directories. This is safe at any time.
282	unlink $PROFILE_DIR/socket-`uname -n` 2>/dev/null	284	unlink $PROFILE_DIR/socket-`uname -n` 2>/dev/null
283	unlink $PROFILE_DIR/tmp-`uname -n` 2>/dev/null	285	unlink $PROFILE_DIR/tmp-`uname -n` 2>/dev/null
Lines 317-322 if [ "$R14_VERSION" -lt "201309150" ]; then Link Here
317	fi	319	fi
318	fi	320	fi
319		321
		322	if [ "$R14_VERSION" -lt "201412080" ]; then
		323	Log "Updating references of temporary paths."
		324	# Get base for temporary directories
		325	if [ "$CACHE_DIR" = "" ]; then
		326	CACHE_BASE_DIR=/var/tmp
		327	else
		328	CACHE_BASE_DIR=`dirname $CACHE_DIR`
		329	fi
		330	if [ "$SOCKET_DIR" = "" ]; then
		331	SOCKET_BASE_DIR=/tmp
		332	else
		333	SOCKET_BASE_DIR=`dirname $SOCKET_DIR`
		334	fi
		335	if [ "$TMP_DIR" = "" ]; then
		336	TMP_BASE_DIR=/tmp
		337	else
		338	TMP_BASE_DIR=`dirname $TMP_DIR`
		339	fi
		340	# Exclude user data files --- we don't want to touch those files.
		341	find "$PROFILE_DIR" \
		342	-path $PROFILE_DIR/share/apps/amarok/albumcovers -prune -o \
		343	-path $PROFILE_DIR/share/apps/basket/baskets -prune -o \
		344	-path $PROFILE_DIR/share/apps/juk/covers -prune -o \
		345	-path $PROFILE_DIR/share/apps/kget/logs -prune -o \
		346	-path $PROFILE_DIR/share/apps/kmail/autosave -prune -o \
		347	-path $PROFILE_DIR/share/apps/kmail/dimap -prune -o \
		348	-path $PROFILE_DIR/share/apps/kmail/imap -prune -o \
		349	-path $PROFILE_DIR/share/apps/kmail/mail -prune -o \
		350	-path $PROFILE_DIR/share/apps/kmail/search -prune -o \
		351	-path $PROFILE_DIR/share/apps/knotes -prune -o \
		352	-path $PROFILE_DIR/share/apps/kopete/logs -prune -o \
		353	-type f -print0 2>/dev/null \| \
		354	xargs -r0 grep -ZIEl "($TMP_BASE_DIR/kde\|$SOCKET_BASE_DIR/ksocket\|$CACHE_BASE_DIR/kde[0-9]*cache)-" \| \
		355	xargs -r0 sed -ri -e "s\|$TMP_BASE_DIR/kde-\|$TMP_BASDE_DIR/tde-\|g" \
		356	-e "s\|$SOCKET_BASE_DIR/ksocket-\|$SOCKET_BASE_DIR/tdesocket-\|g" \
		357	-e "s\|$CACHE_BASE_DIR/kde[0-9]*cache-\|$CACHE_BASE_DIR/tdecache-\|g"
		358	# Cleanup variables
		359	unset CACHE_BASE_DIR
		360	unset SOCKET_BASE_DIR
		361	unset TMP_BASE_DIR
		362	fi
320	if [ "$R14_VERSION" -lt "201309150" ]; then	363	if [ "$R14_VERSION" -lt "201309150" ]; then
321	Log "Updating references of $TDEDIR/share/applications/kde to share/applications/tde."	364	Log "Updating references of $TDEDIR/share/applications/kde to share/applications/tde."
322	# Exclude KMail mail files --- we don't want to touch those files.	365	# Exclude KMail mail files --- we don't want to touch those files.