7 Oct
2012
7 Oct
'12
3:40 a.m.
I looked at the commit 58823f36, and I propose to
adjust
sanity checks so that instead of binaries existence check the existence of
configuration file.
For example: I had previously installed Krita => I have
configuration. But at this moment I have not installed Chalk => configuration
is not converted. When I install Chalk later, the configuration will be
missing.
In addition, testing tdeprint based on the
/opt/trinity/include/tdeprint is not appropriate. I have installed package
tdeprint-trinity,
but /opt/trinity/include/tdeprint not exists. This is a part
of package tdelibs-trinity-dev.
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 22:38:01.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 [ -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 $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 $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 $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 $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