TDE
/
tdebase
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase
0
0
Fork 0
Code Issues Releases Wiki Activity

Fix conditions on new rules in r14-xdg-update

Browse Source
pull/2/head
Slávek Banko 11 years ago
parent d7f8c27eee
commit e990ea9964
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File

8
r14-xdg-update
Unescape View File

@ -68,7 +68,7 @@ Log () {
# Main script: # Main script:
SCRIPT_NAME="`basename \`readlink -f $0\``" SCRIPT_NAME="`basename \`readlink -f $0\``"
SCRIPT_VERSION=201401051 SCRIPT_VERSION=201401052
# Allow forced execution of this script regardless of the kdeglobals setting # Allow forced execution of this script regardless of the kdeglobals setting
# and allow passing a user home directory as a positional parameter. # and allow passing a user home directory as a positional parameter.
@ -651,7 +651,7 @@ if [ "$R14_VERSION" -lt "201401050" ]; then
fi fi
fi fi
if [ "$R14_VERSION" -lt "201401040" ]; then if [ "$R14_VERSION" -lt "201401052" ]; then
# Rename the user's custom launcher menu. # Rename the user's custom launcher menu.
# Before the release of R14.0.0, custom user menus had the same file name as KDE4: # Before the release of R14.0.0, custom user menus had the same file name as KDE4:
# applications-kmenuedit.menu. Under that condition, there is a possibility the user # applications-kmenuedit.menu. Under that condition, there is a possibility the user
@ -687,7 +687,7 @@ if [ "$R14_VERSION" -lt "201401040" ]; then
fi fi
fi fi
if [ "$R14_VERSION" -lt "201401040" ]; then if [ "$R14_VERSION" -lt "201401052" ]; then
# Update the user's custom menu. Any custom menu should have been renamed a few lines above. # Update the user's custom menu. Any custom menu should have been renamed a few lines above.
if [ -r $USER_DIR/.config/menus/applications-tdemenuedit.menu ] && [ "$CUSTOM_MENU" != "TDE" ]; then if [ -r $USER_DIR/.config/menus/applications-tdemenuedit.menu ] && [ "$CUSTOM_MENU" != "TDE" ]; then
# KDE/TDE 3.5.x or converted KDE4. No need to update a pre R14 menu. # KDE/TDE 3.5.x or converted KDE4. No need to update a pre R14 menu.
@ -695,7 +695,7 @@ if [ "$R14_VERSION" -lt "201401040" ]; then
fi fi
fi fi
if [ "$R14_VERSION" -lt "201401040" ]; then if [ "$R14_VERSION" -lt "201401052" ]; then
Log "Updating profile *.desktop files." Log "Updating profile *.desktop files."
# First update *.desktop files in the Trinity profile folder. Updating these files is safe. # First update *.desktop files in the Trinity profile folder. Updating these files is safe.
find "$PROFILE_DIR" -name "*.desktop" -print0 2>/dev/null | \ find "$PROFILE_DIR" -name "*.desktop" -print0 2>/dev/null | \

Write Preview
Loading…
Cancel
Save