summaryrefslogtreecommitdiffstats
path: root/migratekde3
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2012-07-18 00:31:32 -0500
committerDarrell Anderson <humanreadable@yahoo.com>2012-07-18 00:31:32 -0500
commit4c855e4813956d4178f60c58ad27f2e3a38ab263 (patch)
tree961bbf1920db0213660143ed00f718d0277e82c1 /migratekde3
parente6dd2c450879b25f4e4cfe72d7e2acd07cb54676 (diff)
downloadtdebase-4c855e4813956d4178f60c58ad27f2e3a38ab263.tar.gz
tdebase-4c855e4813956d4178f60c58ad27f2e3a38ab263.zip
Additional fixes to the migratekde3 and r14-xdg-update scripts.
Diffstat (limited to 'migratekde3')
-rw-r--r--migratekde38
1 files changed, 6 insertions, 2 deletions
diff --git a/migratekde3 b/migratekde3
index 886e7d29..7e5969de 100644
--- a/migratekde3
+++ b/migratekde3
@@ -199,7 +199,8 @@ if [ -n "$KDE3_PROFILE" ]; then
echo "Cleaning config files (but not KMail mail files. :-))" 1>&2
echo "Cleaning, first pass..." 1>&2
find $HOME/.trinity -path $HOME/.trinity/share/apps/kmail/mail -prune -o -type f -exec sed -i "s|/${KDE3_PROFILE}|/\.trinity|g" {} \;
- if [ "$?" = "0" ]; then
+ EXIT_CODE="$?"
+ if [ "$EXIT_CODE" = "0" ]; then
echo "Done." 1>&2
else
echo "There was an error with the first pass." 1>&2
@@ -209,8 +210,11 @@ if [ -n "$KDE3_PROFILE" ]; then
echo "The \$TDEDIR environment variable does not exist. Can't complete the cleanup." 1>&2
else
echo "Cleaning, second pass..." 1>&2
+ find $HOME/.trinity -path $HOME/.trinity/share/apps/kmail/mail -prune -o -type f -exec sed -i "s|/opt/kde/|${TDEDIR}/|g" {} \;
+ EXIT_CODE_1="$?"
find $HOME/.trinity -path $HOME/.trinity/share/apps/kmail/mail -prune -o -type f -exec sed -i "s|/opt/kde3/|${TDEDIR}/|g" {} \;
- if [ "$?" = "0" ]; then
+ EXIT_CODE_2="$?"
+ if [ "$EXIT_CODE_1" = "0" ] && [ "$EXIT_CODE_2" = "0" ]; then
echo "Done." 1>&2
else
echo "There was an error with the second pass." 1>&2