From 941d7ec4483297e698b0af2732b49f850d085753 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Wed, 21 Mar 2018 00:47:42 +0100 Subject: [PATCH] rpm: avoid removing unrelated files on template reinstall Fixes QubesOS/qubes-issues#3294 --- templates.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/templates.spec b/templates.spec index cb0fcde..4c036ec 100644 --- a/templates.spec +++ b/templates.spec @@ -58,8 +58,13 @@ touch $RPM_BUILD_ROOT/%{dest_dir}/icon.png export XDG_DATA_DIRS=/usr/share/ if [ "$1" -gt 1 ] ; then # upgrading already installed template... - echo "--> Removing previous menu shortcuts..." - xdg-desktop-menu uninstall --mode system %{dest_dir}/apps/*.directory %{dest_dir}/apps/*.desktop + # avoid removing innocent files if *.desktop doesn't mach anything + # https://bugs.freedesktop.org/105635 + if ls %{dest_dir}/apps/*.directory %{dest_dir}/apps/*.desktop >/dev/null 2>&1; then + echo "--> Removing previous menu shortcuts..." + xdg-desktop-menu uninstall --mode system \ + %{dest_dir}/apps/*.directory %{dest_dir}/apps/*.desktop + fi fi