trinity-devel@lists.pearsoncomputing.net

Message: previous - next
Month: October 2012

Re: [trinity-devel] Sanity checks to the migratekde3 (commit 58823f36)

From: Darrell Anderson <humanreadable@...>
Date: Sat, 6 Oct 2012 21:04:04 -0700 (PDT)
> That patch will not help.
> 
> Whereas krita was renamed to chalk before 3.5.13 was
> released, the others were not renamed until after 3.5.13.
> Thus, renaming those respective config files for 3.5.13 or
> 3.5.13.1 users will make things worse. After I posted the
> patch I remembered that is why why I tested the existence of
> the executables.
> 
> The patch for krita/chalk probably is safe. For tdeprint,
> rather than test for the include file because Debian
> separates user and developer files, the next best test
> probably is [ -d $TDEDIR/share/apps/tdeprint].

How about this:

diff -urN tdebase/migratekde3 tdebase.new/migratekde3
--- tdebase/migratekde3 2012-09-29 01:35:28.000000000 -0500
+++ tdebase.new/migratekde3 2012-10-06 23:01:41.000000000 -0500
@@ -320,32 +320,32 @@
   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 [ -d $TDEDIR/share/apps/tdeprint ] && [ -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 [ -f $TDEDIR/bin/tdesu ] && [ -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 [ -f $TDEDIR/bin/tdevelop ] && [ -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 [ -f $TDEDIR/bin/twin ] && [ -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 [ -f $TDEDIR/bin/twin4 ] && [ -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


Darrell