|
|
|
@ -291,9 +291,14 @@ find "$USER_DIR/.local" -name "*.desktop" -exec sed -i 's|KDE\;|TDE\;|g' {} \; 2
|
|
|
|
|
Message_Prefix
|
|
|
|
|
echo "Updating references of $TDEDIR/share/applications/kde to share/applications/tde."
|
|
|
|
|
# Exclude KMail mail files --- we don't want to touch those files.
|
|
|
|
|
if [ -d "$PROFILE_DIR/share/apps/kmail/mail" ]; then
|
|
|
|
|
find "$PROFILE_DIR" -path "$PROFILE_DIR/share/apps/kmail/mail" -prune -o -type f -exec sed -i "s|$TDEDIR/share/applications/kde|$TDEDIR/share/applications/tde|g" {} \; 2>/dev/null
|
|
|
|
|
else
|
|
|
|
|
find "$PROFILE_DIR" -type f -exec sed -i "s|$TDEDIR/share/applications/kde|$TDEDIR/share/applications/tde|g" {} \; 2>/dev/null
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
# Preserve keyboard shortcuts and input actions.
|
|
|
|
|
if [ -r "$PROFILE_DIR/share/config/khotkeysrc" ]; then
|
|
|
|
|
Message_Prefix
|
|
|
|
|
echo "Updating user-defined keyboard shortcuts in khotkeysrc."
|
|
|
|
|
sed -i 's|CommandURL=kde-|CommandURL=tde-|g' "$PROFILE_DIR/share/config/khotkeysrc" 2>/dev/null
|
|
|
|
@ -308,6 +313,7 @@ sed -i 's|www\.kde\.org|www\.trinitydesktop\.org|g' "$PROFILE_DIR/share/config/k
|
|
|
|
|
sed -i 's|KDE3\.1|TDE|g' "$PROFILE_DIR/share/config/khotkeysrc" 2>/dev/null
|
|
|
|
|
sed -i 's|kde32b1|trinity2b1|g' "$PROFILE_DIR/share/config/khotkeysrc" 2>/dev/null
|
|
|
|
|
sed -i 's|kde321|trinity21|g' "$PROFILE_DIR/share/config/khotkeysrc" 2>/dev/null
|
|
|
|
|
fi
|
|
|
|
|
# Fix the some of the same text strings in kglobalshortcutsrc.
|
|
|
|
|
Message_Prefix
|
|
|
|
|
echo "Updating some text strings in kglobalshortcutsrc."
|
|
|
|
@ -316,11 +322,14 @@ sed -i 's|www\.kde\.org|www\.trinitydesktop\.org|g' "$PROFILE_DIR/share/config/k
|
|
|
|
|
sed -i 's|KDE3\.1|TDE|g' "$PROFILE_DIR/share/config/kglobalshortcutsrc" 2>/dev/null
|
|
|
|
|
|
|
|
|
|
# Preserve app preferences.
|
|
|
|
|
if [ -r $PROFILE_DIR/share/config/profilerc ]; then
|
|
|
|
|
Message_Prefix
|
|
|
|
|
echo "Updating user-defined app preferences in profilerc."
|
|
|
|
|
sed -i 's|Application=kde-|Application=tde-|g' "$PROFILE_DIR/share/config/profilerc" 2>/dev/null
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
# Preserve kicker/panel icons.
|
|
|
|
|
if [ -r $PROFILE_DIR/share/config/kickerrc ]; then
|
|
|
|
|
Message_Prefix
|
|
|
|
|
echo "Updating kicker/panel customizations in kickerrc."
|
|
|
|
|
if [ -r "$PROFILE_DIR/share/config/kickerrc" ]; then
|
|
|
|
@ -329,6 +338,7 @@ else
|
|
|
|
|
Message_Prefix
|
|
|
|
|
echo "kickerrc does not exist."
|
|
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
# Preserve Quick Launch icons.
|
|
|
|
|
# There should only be one configuration file, but old KDE3 remnant files might exist ofr users who
|
|
|
|
@ -412,7 +422,11 @@ else
|
|
|
|
|
fi
|
|
|
|
|
TEST_NUM="3"
|
|
|
|
|
R14_UPDATE_TEST3=""
|
|
|
|
|
find "$PROFILE_DIR" "$PROFILE_DIR/share/apps/kmail/mail" -prune -o -type f -exec grep -l "$TDEDIR/share/applications/kde" {} \; &>${CACHE_DIR}/${SCRIPT_NAME}-test${TEST_NUM}.txt
|
|
|
|
|
if [ -d "$PROFILE_DIR/share/apps/kmail/mail" ]; then
|
|
|
|
|
find "$PROFILE_DIR" -path "$PROFILE_DIR/share/apps/kmail/mail" -prune -o -type f -exec grep -l "$TDEDIR/share/applications/kde" {} \; &>${CACHE_DIR}/${SCRIPT_NAME}-test${TEST_NUM}.txt
|
|
|
|
|
else
|
|
|
|
|
find "$PROFILE_DIR" -type f -exec grep -l "$TDEDIR/share/applications/kde" {} \; &>${CACHE_DIR}/${SCRIPT_NAME}-test${TEST_NUM}.txt
|
|
|
|
|
fi
|
|
|
|
|
if [ -s ${CACHE_DIR}/${SCRIPT_NAME}-test${TEST_NUM}.txt ]; then
|
|
|
|
|
R14_UPDATE_TEST3="failed"
|
|
|
|
|
MESSAGE="Some Trinity profile R14 XDG compliance updates failed.\n\n(Check files for '$TDEDIR/share/applications/kde' in\n${CACHE_DIR}/${SCRIPT_NAME}-test${TEST_NUM}.txt.)"
|
|
|
|
@ -422,6 +436,7 @@ else
|
|
|
|
|
fi
|
|
|
|
|
TEST_NUM="4"
|
|
|
|
|
R14_UPDATE_TEST4=""
|
|
|
|
|
if [ -r "$PROFILE_DIR/share/config/khotkeysrc" ]; then
|
|
|
|
|
grep "CommandURL=kde-" "$PROFILE_DIR/share/config/khotkeysrc" &>${CACHE_DIR}/${SCRIPT_NAME}-test${TEST_NUM}.txt
|
|
|
|
|
if [ -s ${CACHE_DIR}/${SCRIPT_NAME}-test${TEST_NUM}.txt ]; then
|
|
|
|
|
R14_UPDATE_TEST4="failed"
|
|
|
|
@ -429,8 +444,10 @@ if [ -s ${CACHE_DIR}/${SCRIPT_NAME}-test${TEST_NUM}.txt ]; then
|
|
|
|
|
else
|
|
|
|
|
rm -f ${CACHE_DIR}/${SCRIPT_NAME}-test${TEST_NUM}.txt 2>/dev/null
|
|
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
|
TEST_NUM="5"
|
|
|
|
|
R14_UPDATE_TEST5=""
|
|
|
|
|
if [ -r "$PROFILE_DIR/share/config/khotkeysrc" ]; then
|
|
|
|
|
grep "K Menu - kde-" "$PROFILE_DIR/share/config/khotkeysrc" &>${CACHE_DIR}/${SCRIPT_NAME}-test${TEST_NUM}.txt
|
|
|
|
|
if [ -s ${CACHE_DIR}/${SCRIPT_NAME}-test${TEST_NUM}.txt ]; then
|
|
|
|
|
R14_UPDATE_TEST5="failed"
|
|
|
|
@ -439,8 +456,10 @@ if [ -s ${CACHE_DIR}/${SCRIPT_NAME}-test${TEST_NUM}.txt ]; then
|
|
|
|
|
else
|
|
|
|
|
rm -f ${CACHE_DIR}/${SCRIPT_NAME}-test${TEST_NUM}.txt 2>/dev/null
|
|
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
|
TEST_NUM="6"
|
|
|
|
|
R14_UPDATE_TEST6=""
|
|
|
|
|
if [ -r $PROFILE_DIR/share/config/profilerc ]; then
|
|
|
|
|
grep "Application=kde-" "$PROFILE_DIR/share/config/profilerc" &>${CACHE_DIR}/${SCRIPT_NAME}-test${TEST_NUM}.txt
|
|
|
|
|
if [ -s ${CACHE_DIR}/${SCRIPT_NAME}-test${TEST_NUM}.txt ]; then
|
|
|
|
|
R14_UPDATE_TEST6="failed"
|
|
|
|
@ -449,8 +468,10 @@ if [ -s ${CACHE_DIR}/${SCRIPT_NAME}-test${TEST_NUM}.txt ]; then
|
|
|
|
|
else
|
|
|
|
|
rm -f ${CACHE_DIR}/${SCRIPT_NAME}-test${TEST_NUM}.txt 2>/dev/null
|
|
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
|
TEST_NUM="7"
|
|
|
|
|
R14_UPDATE_TEST7=""
|
|
|
|
|
if [ -r $PROFILE_DIR/share/config/kickerrc ]; then
|
|
|
|
|
grep "StorageId\[\$e\]=kde-" "$PROFILE_DIR/share/config/kickerrc" &>${CACHE_DIR}/${SCRIPT_NAME}-test${TEST_NUM}.txt
|
|
|
|
|
if [ -s ${CACHE_DIR}/${SCRIPT_NAME}-test${TEST_NUM}.txt ]; then
|
|
|
|
|
R14_UPDATE_TEST7="failed"
|
|
|
|
@ -459,6 +480,7 @@ if [ -s ${CACHE_DIR}/${SCRIPT_NAME}-test${TEST_NUM}.txt ]; then
|
|
|
|
|
else
|
|
|
|
|
rm -f ${CACHE_DIR}/${SCRIPT_NAME}-test${TEST_NUM}.txt 2>/dev/null
|
|
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
|
TEST_NUM="8"
|
|
|
|
|
R14_UPDATE_TEST8=""
|
|
|
|
|
if [ "$QUICK_LAUNCH_CONFIG" != "" ]; then
|
|
|
|
|