Attachment #2356 for bug #2202

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 2202
Collapse All | Expand All




fi
unset BIN_DIR

# Trap when the user runs this script while in a Trinity session.
# Most files can be updated "live" but some can't, such as kdeglobals.
if [ "$TDE_FULL_SESSION" != "" ] && [ "$TDE_SESSION_UID" != "" ] && [ "`ps ax | grep \`tail -n1 $HOME/.DCOPserver_\`uname -n\`__0 2>/dev/null\` | grep -v grep`" != "" ]; then
  MESSAGE="You are running this script while a Trinity session is active.\nMost files can be updated \"live\" but some cannot, such as kdeglobals.\n\nThis script probably will not complete successfully. :-)"
  # Are we in X? Display an X dialog explaining breakage.
  printf "%b" "$MESSAGE\n"
  Wait_For_Response "Continue?"
  Proceed_From_Response
fi

echo
echo "This script migrates an existing KDE3 profile directory."
echo "The definition of a KDE3 profile directory includes some"

  fi
fi

# Trap when the user runs this script while in a Trinity session.
# Most files can be updated "live" but some can't, such as kdeglobals.
if [ "$TDE_FULL_SESSION" != "" ] || [ "$TDE_SESSION_UID" != "" ] || [ -f $HOME/.DCOPserver_`uname -n`__* ]; then
  MESSAGE="You are running this script while a Trinity session is active.\nMost files can be updated \"live\" but some cannot, such as kdeglobals.\n\nThis script might complete successfully and might not. Probably not. :-)"
  # Are we in X? Display an X dialog explaining breakage.
  printf "%b" "$MESSAGE\n"
  Wait_For_Response "Continue?"
  Proceed_From_Response
fi

if [ -d "$HOME/.trinity" ] && [ "$BACKUP" = "true" ]; then
  echo "$HOME/.trinity already exists." 1>&2
  echo "User requested a backup copy."




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

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

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


unset KDEGLOBALS_KEY_VALUE

WARNING_MESSAGE="Trinity R14 XDG compliance updates have been interrupted.\n\nWithout R14 XDG compliance updates, some Trinity apps will fail to\nfunction properly.\n\nFailures include the following:\n\n* Many left-side icon lists will not populate,\n  such as the Panel and Konqueror configuration dialogs.\n\n* User-defined keyboard shortcuts fail (khotkeysrc).\n  System defined shortcuts remain functional.\n\n* User-defined app preferences fail (profilerc).\n\n* Konqueror navigation/sidebar panel won't open.\n\n* User-defined konqueror service menus, kicker customization,\n* konqueror sidebar, Recent Documents list fail.\n\nPlease exercise appropriate action.\n"

# As the user should not be logged into a Trinity session when running
# this script, or an administrator might run this script remotely, the

  if [ "$USER_DIR" = "$HOME" ] && [ "$DISPLAY" != "" ]; then
    echo "[r14-xdg-update] Warning! The profile directory $PROFILE_DIR is a" 1>&2
    echo "                 sym link to $TDEHOME_LINK!" 1>&2
    echo "                 R14 updates will not continue because Trinity needs its own" 1>&2
    echo "                 separate profile directory." 1>&2
    echo "                 Without R14 updates some Trinity apps will fail to function correctly." 1>&2
  fi
  MESSAGE="Oops! The profile directory $PROFILE_DIR is a sym link to $TDEHOME_LINK.\n\n${WARNING_MESSAGE}\nPossible remedies:\n\n* Contact your system administrator.\n\n* Manually break the sym link to force creating a fresh Trinity profile.\n\n* Use the ${TDEDIR}/bin/migratekde3 script to migrate a KDE3 profile to Trinity."
  # Are we in X? Display an X dialog explaining breakage.
  if [ "$USER_DIR" = "$HOME" ] && [ "$DISPLAY" != "" ]; then
    MESSAGE="${MESSAGE}\n\nSelecting the Continue button means preserving the KDE3 profile and\nbreaking the sym link. With the sym link broken, the ${TDEDIR}/bin/migratekde3\nscript will run to migrate the KDE3 profile to Trinity."
    printf "%b" "$MESSAGE" | xmessage -center -file - -buttons Continue,Quit > /dev/null 2>/dev/null
    EXIT_CODE="$?"
    unset TDEHOME_LINK

      exit 1
    else
      # User selected the Continue button: continue this script and start TDE.
      Log "The user chose to continue to break the sym link."
      BREAK_SYMLINK="true"
    fi
  else

  if [ "$BREAK_SYMLINK" = "true" ]; then
    unlink "$USER_DIR/.trinity" 2>/dev/null
    if [ "`readlink \"$USER_DIR/.trinity\"`" = "" ]; then
      MESSAGE="Sym link broken. With the sym link broken, will now attempt\nto migrate the KDE3 profile."
      Message_Prefix
      printf "%b" "$MESSAGE"
      echo
      ${TDEDIR}/bin/migratekde3
    else
      MESSAGE="Unable to break the sym link. Check file and directory privileges. Quitting."
      Message_Prefix
      echo "$MESSAGE"
      echo
      unset PROFILE_DIR
      unset TDEHOME_LINK
      exit 1
    fi
  fi
  unset PROFILE_DIR
  unset TDEHOME_LINK
  exit 1
fi
unset TDEHOME_LINK


Return to bug 2202

Lines 130-135 Link Here

(-)tdebase/migratekde3 (-10 / +10 lines)
130	fi	130	fi
131	unset BIN_DIR	131	unset BIN_DIR
132		132
		133	# Trap when the user runs this script while in a Trinity session.
		134	# Most files can be updated "live" but some can't, such as kdeglobals.
		135	if [ "$TDE_FULL_SESSION" != "" ] && [ "$TDE_SESSION_UID" != "" ] && [ "`ps ax \| grep \`tail -n1 $HOME/.DCOPserver_\`uname -n\`__0 2>/dev/null\` \| grep -v grep`" != "" ]; then
		136	MESSAGE="You are running this script while a Trinity session is active.\nMost files can be updated \"live\" but some cannot, such as kdeglobals.\n\nThis script probably will not complete successfully. :-)"
		137	# Are we in X? Display an X dialog explaining breakage.
		138	printf "%b" "$MESSAGE\n"
		139	Wait_For_Response "Continue?"
		140	Proceed_From_Response
		141	fi
		142
133	echo	143	echo
134	echo "This script migrates an existing KDE3 profile directory."	144	echo "This script migrates an existing KDE3 profile directory."
135	echo "The definition of a KDE3 profile directory includes some"	145	echo "The definition of a KDE3 profile directory includes some"
Lines 172-187 Link Here
172	fi	182	fi
173	fi	183	fi
174		184
175	# Trap when the user runs this script while in a Trinity session.
176	# Most files can be updated "live" but some can't, such as kdeglobals.
177	if [ "$TDE_FULL_SESSION" != "" ] \|\| [ "$TDE_SESSION_UID" != "" ] \|\| [ -f $HOME/.DCOPserver_`uname -n`__* ]; then
178	MESSAGE="You are running this script while a Trinity session is active.\nMost files can be updated \"live\" but some cannot, such as kdeglobals.\n\nThis script might complete successfully and might not. Probably not. :-)"
179	# Are we in X? Display an X dialog explaining breakage.
180	printf "%b" "$MESSAGE\n"
181	Wait_For_Response "Continue?"
182	Proceed_From_Response
183	fi
184
185	if [ -d "$HOME/.trinity" ] && [ "$BACKUP" = "true" ]; then	185	if [ -d "$HOME/.trinity" ] && [ "$BACKUP" = "true" ]; then
186	echo "$HOME/.trinity already exists." 1>&2	186	echo "$HOME/.trinity already exists." 1>&2
187	echo "User requested a backup copy."	187	echo "User requested a backup copy."

Lines 3-9 Link Here

(-)tdebase/r14-xdg-update (-10 / +11 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=201410170	6	SCRIPT_VERSION=201411240
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 91-97 Link Here
91		91
92	unset KDEGLOBALS_KEY_VALUE	92	unset KDEGLOBALS_KEY_VALUE
93		93
94	WARNING_MESSAGE="Trinity R14 XDG compliance updates will not be performed.\n\nWithout R14 XDG compliance updates, some Trinity apps will fail to\nfunction properly.\n\nFailures include the following:\n\n* Many left-side icon lists will not populate,\n such as the Panel and Konqueror configuration dialogs.\n\n* User-defined keyboard shortcuts fail (khotkeysrc).\n System defined shortcuts remain functional.\n\n* User-defined app preferences fail (profilerc).\n\n* Konqueror navigation/sidebar panel won't open.\n\n* User-defined konqueror service menus, kicker customization,\n* konqueror sidebar, Recent Documents list fail.\n\nPlease exercise appropriate action.\n"	94	WARNING_MESSAGE="Trinity R14 XDG compliance updates have been interrupted.\n\nWithout R14 XDG compliance updates, some Trinity apps will fail to\nfunction properly.\n\nFailures include the following:\n\n* Many left-side icon lists will not populate,\n such as the Panel and Konqueror configuration dialogs.\n\n* User-defined keyboard shortcuts fail (khotkeysrc).\n System defined shortcuts remain functional.\n\n* User-defined app preferences fail (profilerc).\n\n* Konqueror navigation/sidebar panel won't open.\n\n* User-defined konqueror service menus, kicker customization,\n* konqueror sidebar, Recent Documents list fail.\n\nPlease exercise appropriate action.\n"
95		95
96	# As the user should not be logged into a Trinity session when running	96	# As the user should not be logged into a Trinity session when running
97	# this script, or an administrator might run this script remotely, the	97	# this script, or an administrator might run this script remotely, the
Lines 175-188 Link Here
175	if [ "$USER_DIR" = "$HOME" ] && [ "$DISPLAY" != "" ]; then	175	if [ "$USER_DIR" = "$HOME" ] && [ "$DISPLAY" != "" ]; then
176	echo "[r14-xdg-update] Warning! The profile directory $PROFILE_DIR is a" 1>&2	176	echo "[r14-xdg-update] Warning! The profile directory $PROFILE_DIR is a" 1>&2
177	echo " sym link to $TDEHOME_LINK!" 1>&2	177	echo " sym link to $TDEHOME_LINK!" 1>&2
178	echo " R14 updates will not be performed because Trinity needs its own" 1>&2	178	echo " R14 updates will not continue because Trinity needs its own" 1>&2
179	echo " separate profile directory." 1>&2	179	echo " separate profile directory." 1>&2
180	echo " Without R14 updates some Trinity apps will fail to function correctly." 1>&2	180	echo " Without R14 updates some Trinity apps will fail to function correctly." 1>&2
181	fi	181	fi
182	MESSAGE="Oops! The profile directory $PROFILE_DIR is a sym link to $TDEHOME_LINK.\n\n${WARNING_MESSAGE}\nPossible remedies:\n\n* Contact your system administrator.\n\n* Break the sym link to force creating a fresh Trinity profile.\n\n* Use the migratekde3 script to migrate a KDE3 profile to Trinity."	182	MESSAGE="Oops! The profile directory $PROFILE_DIR is a sym link to $TDEHOME_LINK.\n\n${WARNING_MESSAGE}\nPossible remedies:\n\n* Contact your system administrator.\n\n* Manually break the sym link to force creating a fresh Trinity profile.\n\n* Use the ${TDEDIR}/bin/migratekde3 script to migrate a KDE3 profile to Trinity."
183	# Are we in X? Display an X dialog explaining breakage.	183	# Are we in X? Display an X dialog explaining breakage.
184	if [ "$USER_DIR" = "$HOME" ] && [ "$DISPLAY" != "" ]; then	184	if [ "$USER_DIR" = "$HOME" ] && [ "$DISPLAY" != "" ]; then
185	MESSAGE="${MESSAGE}\n\nSelecting the Continue button means retaining the KDE3 profile and\nbreaking the sym link. With the sym link broken, run the migratekde3\nscript before restarting Trinity to migrate a KDE3 profile or\nallow Trinity to create a fresh profile."	185	MESSAGE="${MESSAGE}\n\nSelecting the Continue button means preserving the KDE3 profile and\nbreaking the sym link. With the sym link broken, the ${TDEDIR}/bin/migratekde3\nscript will run to migrate the KDE3 profile to Trinity."
186	printf "%b" "$MESSAGE" \| xmessage -center -file - -buttons Continue,Quit > /dev/null 2>/dev/null	186	printf "%b" "$MESSAGE" \| xmessage -center -file - -buttons Continue,Quit > /dev/null 2>/dev/null
187	EXIT_CODE="$?"	187	EXIT_CODE="$?"
188	unset TDEHOME_LINK	188	unset TDEHOME_LINK
Lines 193-199 Link Here
193	exit 1	193	exit 1
194	else	194	else
195	# User selected the Continue button: continue this script and start TDE.	195	# User selected the Continue button: continue this script and start TDE.
196	Log "The user chose to continue, which will break the sym link."	196	Log "The user chose to continue to break the sym link."
197	BREAK_SYMLINK="true"	197	BREAK_SYMLINK="true"
198	fi	198	fi
199	else	199	else
Lines 207-226 Link Here
207	if [ "$BREAK_SYMLINK" = "true" ]; then	207	if [ "$BREAK_SYMLINK" = "true" ]; then
208	unlink "$USER_DIR/.trinity" 2>/dev/null	208	unlink "$USER_DIR/.trinity" 2>/dev/null
209	if [ "`readlink \"$USER_DIR/.trinity\"`" = "" ]; then	209	if [ "`readlink \"$USER_DIR/.trinity\"`" = "" ]; then
210	MESSAGE="Sym link broken. With the sym link broken, run the migratekde3\nscript before restarting Trinity to migrate a KDE3 profile or\nallow Trinity to create a fresh profile."	210	MESSAGE="Sym link broken. With the sym link broken, will now attempt\nto migrate the KDE3 profile."
211	Message_Prefix	211	Message_Prefix
212	printf "%b" "$MESSAGE"	212	printf "%b" "$MESSAGE"
213	echo	213	echo
		214	${TDEDIR}/bin/migratekde3
214	else	215	else
215	MESSAGE="Unable to break the sym link. Check file and directory privileges. Quitting."	216	MESSAGE="Unable to break the sym link. Check file and directory privileges. Quitting."
216	Message_Prefix	217	Message_Prefix
217	echo "$MESSAGE"	218	echo "$MESSAGE"
218	echo	219	echo
		220	unset PROFILE_DIR
		221	unset TDEHOME_LINK
		222	exit 1
219	fi	223	fi
220	fi	224	fi
221	unset PROFILE_DIR
222	unset TDEHOME_LINK
223	exit 1
224	fi	225	fi
225	unset TDEHOME_LINK	226	unset TDEHOME_LINK
226		227