From b5101d11d6ad4a64dbed8bb207bd5f315de92696 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Wed, 4 May 2016 01:44:09 +0200 Subject: [PATCH] appmenus: call appropriate kbuildsycoca version (KDE4/KDE5) QubesOS/qubes-issues#1807 --- appmenus-scripts/create-apps-for-appvm.sh | 2 +- appmenus-scripts/qubes-receive-appmenus | 2 +- appmenus-scripts/remove-appvm-appmenus.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/appmenus-scripts/create-apps-for-appvm.sh b/appmenus-scripts/create-apps-for-appvm.sh index 848852c..b22992f 100755 --- a/appmenus-scripts/create-apps-for-appvm.sh +++ b/appmenus-scripts/create-apps-for-appvm.sh @@ -60,5 +60,5 @@ LC_COLLATE=C xdg-desktop-menu install --noupdate $APPSDIR/*.directory $APPSDIR/* if [ -n "$KDE_SESSION_UID" -a -z "$SKIP_CACHE_REBUILD" ]; then xdg-desktop-menu forceupdate - kbuildsycoca4 + kbuildsycoca$KDE_SESSION_VERSION fi diff --git a/appmenus-scripts/qubes-receive-appmenus b/appmenus-scripts/qubes-receive-appmenus index 7bbd479..ab62a2c 100755 --- a/appmenus-scripts/qubes-receive-appmenus +++ b/appmenus-scripts/qubes-receive-appmenus @@ -382,7 +382,7 @@ def main(): "'{0}': {1}".format(child_vm.name, str(e)) subprocess.call(['xdg-desktop-menu', 'forceupdate']) if 'KDE_SESSION_UID' in os.environ: - subprocess.call(['kbuildsycoca4']) + subprocess.call(['kbuildsycoca' + os.environ.get('KDE_SESSION_VERSION', '4')]) os.unsetenv('SKIP_CACHE_REBUILD') diff --git a/appmenus-scripts/remove-appvm-appmenus.sh b/appmenus-scripts/remove-appvm-appmenus.sh index 1423ddc..e9c92a9 100755 --- a/appmenus-scripts/remove-appvm-appmenus.sh +++ b/appmenus-scripts/remove-appvm-appmenus.sh @@ -19,5 +19,5 @@ if ls $APPSDIR/*.directory $APPSDIR/*.desktop > /dev/null 2>&1; then fi if [ -n "$KDE_SESSION_UID" -a -z "$SKIP_CACHE_REBUILD" ]; then - kbuildsycoca4 + kbuildsycoca$KDE_SESSION_VERSION fi