vm/mimeopen: merge user defaults with system one (#423)

vm-init.d/qubes_core

@@ -97,7 +97,10 @@ start()
 stop()
 {
 	su -c 'mkdir -p /home_volatile/user/.local/share/applications' user
-	su -c 'cp -a /home/user/.local/share/applications/defaults.list /home_volatile/user/.local/share/applications/' user
+	su -c 'cp -a /usr/share/applications/defaults.list /home_volatile/user/.local/share/applications/' user
+	if [ -r '/home/user/.local/share/applications/defaults.list' ]; then
+		su -c 'cat /home/user/.local/share/applications/defaults.list >> /home_volatile/user/.local/share/applications/defaults.list' user
+	fi
 	return 0
 }
 

vm-systemd/misc-post-stop.sh

@@ -3,6 +3,9 @@
 # Save default applications for DispVM
 
 su -c 'mkdir -p /home_volatile/user/.local/share/applications' user
-su -c 'cp -a /home/user/.local/share/applications/defaults.list /home_volatile/user/.local/share/applications/' user
+su -c 'cp -a /usr/share/applications/defaults.list /home_volatile/user/.local/share/applications/' user
+if [ -r '/home/user/.local/share/applications/defaults.list' ]; then
+    su -c 'cat /home/user/.local/share/applications/defaults.list >> /home_volatile/user/.local/share/applications/defaults.list' user
+fi
 
 exit 0