appmenus: call appropriate kbuildsycoca version (KDE4/KDE5)

QubesOS/qubes-issues#1807

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

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')
 
 

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