From 433377f76e41e35132cd12f5d4c13c14dc62a3ba Mon Sep 17 00:00:00 2001
From: Frank Morgner <frankmorgner@gmail.com>
Date: Mon, 2 Dec 2019 12:29:32 +0100
Subject: [PATCH] macos: use start_selected instead of selected

otherwise the user's choice would be overwritten when the user clicks
some other installation option.

also, use the domain tag to install to the local drive only
---
 MacOSX/Distribution.xml.in | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/MacOSX/Distribution.xml.in b/MacOSX/Distribution.xml.in
index 22354400..fed08a10 100644
--- a/MacOSX/Distribution.xml.in
+++ b/MacOSX/Distribution.xml.in
@@ -45,19 +45,18 @@ https://developer.apple.com/library/mac/documentation/DeveloperTools/Reference/D
       ]]>
     </script>
     <choices-outline>
-        <line choice="default">
-            <line choice="tokend" />
-            <line choice="startup" />
-        </line>
+        <line choice="default" />
+        <line choice="startup" />
+        <line choice="tokend" />
         <line choice="token" />
     </choices-outline>
     <choice id="default" title="PKCS#11 module and smart card tools" enabled="false">
         <pkg-ref id="org.opensc-project.mac">OpenSC.pkg</pkg-ref>
     </choice>
-    <choice id="tokend" title="TokenD-based smart card driver" selected="osx_before_catalina()">
+    <choice id="tokend" title="TokenD-based smart card driver" start_selected="osx_before_catalina()">
         <pkg-ref id="org.opensc-project.tokend">OpenSC-tokend.pkg</pkg-ref>
     </choice>
-    <choice id="token" title="CryptoTokenKit-based smart card driver" visible="osx_after_yosemite()" selected="osx_after_catalina()">
+    <choice id="token" title="CryptoTokenKit-based smart card driver" visible="osx_after_yosemite()" start_selected="osx_after_catalina()">
         <pkg-ref id="org.opensc-project.mac.opensctoken">OpenSCToken.pkg</pkg-ref>
     </choice>
     <choice id="startup" title="Automatic startup items">