diff options
| author | Darrell Anderson <darrella@clovermail.net> | 2014-11-25 17:01:43 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2014-11-25 17:01:43 -0600 |
| commit | 84987892db83c0fcc68bb4f0d2403571a29cbad3 (patch) | |
| tree | 24bdb9440599608de3f207602de5b6d3f9e2f955 /migratekde3 | |
| parent | 0271348b00218e7115fe6a9454143af5a5092026 (diff) | |
| download | tdebase-84987892db83c0fcc68bb4f0d2403571a29cbad3.tar.gz tdebase-84987892db83c0fcc68bb4f0d2403571a29cbad3.zip | |
Fix up symlinked TDE directory handling in upgrade scripts
Automatically run migratekde3 for symlinked directories if user breaks symlink
This relates to Bug 2202
Diffstat (limited to 'migratekde3')
| -rwxr-xr-x | migratekde3 | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/migratekde3 b/migratekde3 index c106dd718..eff7f182e 100755 --- a/migratekde3 +++ b/migratekde3 @@ -130,6 +130,16 @@ else 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" @@ -172,16 +182,6 @@ if [ "$TDEHOME_LINK" != "" ]; then 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." |