From ba9bbaa6fa63b7d7597a2f97fc1314ad866954af Mon Sep 17 00:00:00 2001
From: Frans van Dorsselaer <17404029+dorssel@users.noreply.github.com>
Date: Tue, 1 Jun 2021 18:14:32 +0200
Subject: [PATCH] Add silent driver install (#20)

Required for 'winget'.
Only enabled when installing non-interactive.
---
 .gitattributes        |   1 +
 .reuse/dep5           |   2 +-
 Drivers/Oracle.cer    | Bin 0 -> 1339 bytes
 Installer/Drivers.wxs |  17 +++++++++++++++++
 4 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 Drivers/Oracle.cer

diff --git a/.gitattributes b/.gitattributes
index fae9ca98..a29eaa59 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -29,3 +29,4 @@
 *.cat   binary
 *.inf   text
 *.sys   binary
+*.cer   binary
diff --git a/.reuse/dep5 b/.reuse/dep5
index 17474c96..9719a7e1 100644
--- a/.reuse/dep5
+++ b/.reuse/dep5
@@ -2,6 +2,6 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: usbipd-win
 Source: https://github.com/dorssel/usbipd-win
 
-Files: Drivers/**/*
+Files: Drivers/Oracle.cer Drivers/**/*
 Copyright: 2011-2020 Oracle Corporation
 License: GPL-2.0-only
diff --git a/Drivers/Oracle.cer b/Drivers/Oracle.cer
new file mode 100644
index 0000000000000000000000000000000000000000..e47fb25a2de9a771f38f92f78297f206ba0d0bcb
GIT binary patch
literal 1339
zcmXqLVl_8tVv%3K%*4pVB*1FWUA9I~bklT&-_BFN#akHgvT<s)d9;1!Wn^S!WiZG$
z<Tl`BV-96u6J`nxHWW1w264EAd0aBnGo4e5N)$Zvk_{yd#6iN`!UE;x<$5VVsbrv(
zUUGh}p`L*bNQzll6|TdvxVW?^HATVGMZq~gB~>9fGd(XeFI~aeQP<EwPMp`!(!dyq
z!5~VU*T~4g*vQz>2*i&vXlz1t5!87c!c5MNhT;aIAj{Z=`GQhY%JcJ66oNDIi&BdX
zr41w@?iTVdN=(j41zKEGkYAKol9``pC~P1IaXnX9W>HCLVop+i1xyFCFcuvKO^iy&
z0maD5z}&>h&j1wXVrpV!WZ1TRa+9Xv{D2Qde;bn*?bBE2E7FlN+SVvpDG|CO)>6~x
zr1DQe&)wfov^V<3^#AGd4&PSn#-~;qIn})3yyDE|S007DW4F1y&Dovz&|!~Hk1le_
z+~;@5()zhDUD@g1iS&=VGanR{g+80oQS<bN+>h%wuf!hu+O%}5)+|%C9@`IsAD`c!
z?0(n&@pi!{`nx>L9t$2bTN%1+#oYj>6x|tXT(>>Gczn@>iz?2CCfp1>H8*1iD>I9s
z)n=vy^L{tZ_~)BCTV{GcSiWB7jk(-wFQxqJ(=?4DHJD2$8gFkiKHWI8vZwh58{3<o
z7QN~_>-#VJPpy13=eLm5RlB)iEr0lZ_1{V}F*7nSE^cDn2@H{~2J*nrl~rbuFc51H
zsm?g3x$1!UKF_L$PwlTQ|L)pvYGfb_QozR|#v&5I<re&~^m1NAfr6UjL$@zRpG(gf
z@PVZH85#exurM>RH-M9%tSSqS0T&yGHXAURvNJOq<bo8*v!ofM7#J+jTcFdXl~Gbs
zV5P60T$E#sk|gyLA?Z&yxmY*dP!A}Nsl$Yj4j+(p3M{S$&IaaeoC$3njBS5&m>CVU
z3^ZVlVqz4N0lA?V=m_*|q3;|JY{0?Bmfpz2$ifIr)G$qqj4WjaB?c-mz5!#K1k@w>
z$;AaI&NA?Ut72+%fO$6&l=X^H6zapW9yI59x`6T>G~0o49WW3|40u3Z5(Wh`lK}&A
z@&=Xzz~s%yVDsSbgmCfFA9tRW->f*>t6ngvw(_H0_ytD0(A5*V)aK0aj`x{u>~sA3
z;sWi3W@inzuvl{V)F|!<V`p^C4B<04G`qkiLjK&gRcn-rMcE~MzuQH9<cm^Y$HDi~
za+Ut+nl7<-6Tdo$KJBn(O22Z$Hqq2mSHiVQ{gr+8=lSa<G5_nh&Dd`5xqZTn{qw4h
z{M8RQ_wMfgw;M&DWhg#xO^;TwmYm_FYq;BBpYe=I=M<gq-TKKgZLizU(!jHOJfpK*
z^~zV6tbh6QE6~h&=fnc1%}u-Z`$fj$*HJF^Ht&~BO$z6lEy1wsg+xxFdD_Eiten#}
VYhQo<{!if?iO331g^5{3O99rI&VT>_

literal 0
HcmV?d00001

diff --git a/Installer/Drivers.wxs b/Installer/Drivers.wxs
index 3d1fa99d..321e6449 100644
--- a/Installer/Drivers.wxs
+++ b/Installer/Drivers.wxs
@@ -16,7 +16,23 @@ SPDX-License-Identifier: GPL-2.0-only
             <Component>
                 <File Id="README.md" />
             </Component>
+            <Component>
+                <File Id="Oracle.cer" />
+            </Component>
         </DirectoryRef>
+
+        <CustomAction
+            Id="DriverSilentInstall"
+            Directory="TARGETDIR"
+            ExeCommand="[System64Folder]certutil.exe –addstore –f TrustedPublisher &quot;[#Oracle.cer]&quot;"
+            Execute="deferred"
+            Return="ignore"
+            />
+
+        <InstallExecuteSequence>
+            <!-- Only on *non-interactive* *install or upgrade*. Required for 'winget' package manager. -->
+            <Custom Action="DriverSilentInstall" Before="MsiProcessDrivers"><![CDATA[(UILevel < 5) AND NOT Installed AND NOT REMOVE]]></Custom>
+        </InstallExecuteSequence>
     </Fragment>
     <Fragment>
         <DirectoryRef Id="Drivers" FileSource="$(var.DriversDir)">
@@ -53,6 +69,7 @@ SPDX-License-Identifier: GPL-2.0-only
     <Fragment>
         <ComponentGroup Id="VBoxUSB">
             <ComponentRef Id="README.md" />
+            <ComponentRef Id="Oracle.cer" />
             <ComponentRef Id="VBoxUSB.cat" />
             <ComponentRef Id="VBoxUSB.sys" />
             <ComponentRef Id="VBoxUSB.inf" />