From d1f55ffeb896fe15191ef76d8b11edf6c0ffa071 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Sat, 29 Sep 2018 11:36:44 +0200 Subject: [PATCH] appmenus: send only persistent appmenus entries, use $XDG_DATA_* It may be useful to create AppVM-specific menu entries in AppVM itself. It may be an application installed there (in /usr/local, or using snap QubesOS/qubes-issues#2766), but it may be also some user custom shortcut. To support this, dom0 will accept menu entries also from TemplateBasedVMs. But to avoid duplicates, qubes.GetAppmenus service should send only menu entries actually stored in that VM, not inherited from its template. To distingush them, first check what type of persistence this VM has (from qubesdb-read /qubes-vm-persistence). If it's rw-only, send only entries stored on /rw. To make it more robust, use $XDG_DATA_DIRS and $XDG_DATA_HOME to discover directories, instead of looking only for /usr/{,local/}share/applications. This makes snap and flatpak handled for free. Fixes QubesOS/qubes-issues#4152 --- qubes-rpc/qubes.GetAppmenus | 44 +++++++++++++++++++++++++++++++++++-- 1 file changed, 42 insertions(+), 2 deletions(-) diff --git a/qubes-rpc/qubes.GetAppmenus b/qubes-rpc/qubes.GetAppmenus index d8a057a..d417c56 100755 --- a/qubes-rpc/qubes.GetAppmenus +++ b/qubes-rpc/qubes.GetAppmenus @@ -1,6 +1,46 @@ -#!/bin/sh +#!/bin/bash # shellcheck disable=SC2016 -find /usr/share/applications/ /usr/local/share/applications/ -name '*.desktop' -print0 2>/dev/null | \ + +# send .desktop files from directories persisting across VM restarts, specifically: +# - any directory in case of "full" persistence +# - directories stored on /rw in case of "rw-only" persistence +# - nothing, otherwise + +if [ -z "$XDG_DATA_HOME" ]; then + XDG_DATA_HOME="$HOME/.local/share" +fi +if [ -z "$XDG_DATA_DIRS" ]; then + XDG_DATA_DIRS="/usr/local/share/:/usr/share/" +fi + +# if read fails for some reason, default to full +persistence=$(qubesdb-read /qubes-vm-persistence || echo full) +rw_devno=$(stat -c %D /rw) + +apps_dirs_to_consider=( "$XDG_DATA_HOME" ) +old_IFS="$IFS" +IFS=: +# shellcheck disable=SC2206 +apps_dirs_to_consider+=( $XDG_DATA_DIRS ) +IFS="$old_IFS" + +apps_dirs=() +for dir in "${apps_dirs_to_consider[@]}"; do + if [ "$persistence" = "full" ]; then + apps_dirs+=( "$dir/applications" ) + elif [ "$persistence" = "rw-only" ] && \ + [ "$(stat -c %D "$dir")" = "$rw_devno" ]; then + apps_dirs+=( "$dir/applications" ) + fi +done + +if [ "${#apps_dirs[@]}" -eq "0" ]; then + # nothing to send, exit early to not let `find` browse the current + # directory + exit 0 +fi + +find "${apps_dirs[@]}" -name '*.desktop' -print0 2>/dev/null | \ xargs -0 awk ' BEGINFILE { entry="" } /^\[/ { if (tolower($0) != "\[desktop entry\]") nextfile }