diff options
| author | Darrell Anderson <[email protected]> | 2012-10-07 15:07:23 -0500 |
|---|---|---|
| committer | Darrell Anderson <[email protected]> | 2012-10-07 15:07:23 -0500 |
| commit | 305b388d01a9caf8cee883ad8cb072b5a37e8576 (patch) | |
| tree | ed185dac25d8dbeb8d29ca772479786854d9a1e9 | |
| parent | f1973e469a2342c0b2a9cc3951dd9e9a6dd6eba5 (diff) | |
| parent | ad8633f6ec2c89825ddbe0307fa06acf7a3dce5a (diff) | |
| download | tdebase-305b388d01a9caf8cee883ad8cb072b5a37e8576.tar.gz tdebase-305b388d01a9caf8cee883ad8cb072b5a37e8576.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase
| -rw-r--r-- | migratekde3 | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/migratekde3 b/migratekde3 index 4919d5d15..dd288d21e 100644 --- a/migratekde3 +++ b/migratekde3 @@ -108,6 +108,7 @@ if [ -x $BIN_DIR/tde-config ]; then echo "Trinity Desktop Environment version is $TDE_VERSION" 1>&2 export TDEDIR=${BIN_DIR%/bin} echo "Trinity Desktop Environment base directory is $TDEDIR" 1>&2 + TDE_REBRAND=1 else # This might be a Trinity version before kde-config was renamed to tde-config. # Don't use kde-config because of a bug that always creates a $TDEHOME directory. @@ -320,32 +321,32 @@ if [ -n "$KDE3_PROFILE" ] && [ -d "$KDE3_PROFILE" ]; then fi echo "Renaming various configuration files and directories." # Don't force renaming in case this cript is used to update an existing Trinity profile. - if [ -f $TDEDIR/bin/chalk ]; then + if [ -f $HOME/.trinity/share/config/kritarc ] || [ -d $HOME/.trinity/share/apps/krita ]; then echo " krita->chalk" mv $HOME/.trinity/share/config/kritarc $HOME/.trinity/share/config/chalkrc 2>/dev/null mv $HOME/.trinity/share/apps/krita $HOME/.trinity/share/apps/chalk 2>/dev/null fi - if [ -d /opt/trinity/include/tdeprint ]; then + if [ "$TDE_REBRAND" != "" ] && [ -f $HOME/.trinity/share/config/kdeprintrc ] || [ -d $HOME/.trinity/share/apps/kdeprint ]; then echo " kdeprint->tdeprint" mv $HOME/.trinity/share/config/kdeprintrc $HOME/.trinity/share/config/tdeprintrc 2>/dev/null mv $HOME/.trinity/share/apps/kdeprint $HOME/.trinity/share/apps/tdeprint 2>/dev/null fi - if [ -f $TDEDIR/bin/tdesu ]; then + if [ "$TDE_REBRAND" != "" ] && [ -f $HOME/.trinity/share/config/kdesurc ]; then echo " kdesurc->tdesurc" mv $HOME/.trinity/share/config/kdesurc $HOME/.trinity/share/config/tdesurc 2>/dev/null fi - if [ -f $TDEDIR/bin/tdevelop ]; then + if [ "$TDE_REBRAND" != "" ] && [ -f $HOME/.trinity/share/config/kdeveloprc ]; then echo " kdevelop->tdevelop" mv $HOME/.trinity/share/config/kdeveloprc $HOME/.trinity/share/config/tdeveloprc 2>/dev/null fi - if [ -f $TDEDIR/bin/twin ]; then + if [ "$TDE_REBRAND" != "" ] && [ -f $HOME/.trinity/share/config/kwinrc ] || [ -d $HOME/.trinity/share/apps/kwinrulesrc ]; then echo " kwin->twin" mv $HOME/.trinity/share/config/kwinrc $HOME/.trinity/share/config/twinrc 2>/dev/null mv $HOME/.trinity/share/config/kwinrc.eventsrc $HOME/.trinity/share/config/twinrc.eventsrc 2>/dev/null mv $HOME/.trinity/share/config/kwinrc $HOME/.trinity/share/config/twinrc 2>/dev/null mv $HOME/.trinity/share/apps/kwinrulesrc $HOME/.trinity/share/apps/twinrulesrc 2>/dev/null fi - if [ -f $TDEDIR/bin/twin4 ]; then + if [ "$TDE_REBRAND" != "" ] && [ -f $HOME/.trinity/share/config/kwin4rc ]; then echo " kwin4->twin4" mv $HOME/.trinity/share/config/kwin4rc $HOME/.trinity/share/config/twin4rc 2>/dev/null fi |