|
30 | 30 | <RegistrySearch Id="CrcInstalledReg" Root="HKCU" Key="Software\Red Hat\Red Hat OpenShift Local" Name="installed" Type="raw" />
|
31 | 31 | </Property>
|
32 | 32 |
|
| 33 | + <Property Id="POWERSHELLEXE"> |
| 34 | + <RegistrySearch Id="POWERSHELLEXE" |
| 35 | + Type="raw" |
| 36 | + Root="HKLM" |
| 37 | + Key="SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" |
| 38 | + Name="Path" /> |
| 39 | + </Property> |
| 40 | + |
33 | 41 | <util:Group Id="CrcUsersGroup" Name="crc-users" />
|
34 | 42 | <Directory Id="TARGETDIR" Name="SourceDir">
|
35 | 43 | <Directory Id="ProgramFiles64Folder">
|
|
85 | 93 | <CustomAction Id="RemoveCrcGroupRollback" BinaryKey="WixCA" DllEntry="WixQuietExec" Execute="rollback" Impersonate="no" Return="ignore" />
|
86 | 94 | <SetProperty Action="CARemoveCrcDaemonTask" Id="RemoveCrcDaemonTask" Value='"[System64Folder]cmd.exe" /c schtasks /delete /TN crcDaemon /F' Before='RemoveFiles' Sequence="execute"/>
|
87 | 95 | <CustomAction Id="RemoveCrcDaemonTask" BinaryKey="WixCA" DllEntry="WixQuietExec" Execute="deferred" Impersonate="no" Return="ignore" />
|
88 |
| - |
89 | 96 | <SetProperty Action="CAInstallHyperv" Id="InstallHyperv" Value='"[System64Folder]dism.exe" /online /enable-feature /featureName:microsoft-hyper-v-all /NoRestart /quiet' Before="InstallHyperv" Sequence="execute"/>
|
90 | 97 | <CustomAction Id="InstallHyperv" BinaryKey="WixCA" DllEntry="WixQuietExec64" Execute="deferred" Impersonate="no" Return="ignore" />
|
91 |
| - |
92 |
| - <SetProperty Action="CAAddUserToHypervAdminGroup" Id="AddUserToHypervAdminGroup" Value='"[System64Folder]cmd.exe" /c cd /d "[INSTALLDIR]" && .\crc.exe setup --log-level debug' Before="AddUserToHypervAdminGroup" Sequence="execute"/> |
93 |
| - <CustomAction Id="AddUserToHypervAdminGroup" BinaryKey="WixCA" DllEntry="WixQuietExec" Execute="deferred" Impersonate="no" Return="ignore" /> |
| 98 | + <SetProperty Action="CAAddUserToHypervAdminGroup" |
| 99 | + Id="AddUserToHypervAdminGroup" |
| 100 | + Value=""[POWERSHELLEXE]" -NonInteractive -ExecutionPolicy Bypass -NoProfile -Command "Add-LocalGroupMember -Member [LogonUser] -SID S-1-5-32-578"" |
| 101 | + Before="AddUserToHypervAdminGroup" |
| 102 | + Sequence="execute"/> |
| 103 | + <CustomAction Id="AddUserToHypervAdminGroup" BinaryKey="WixCA" DllEntry="WixQuietExec64" Execute="deferred" Impersonate="no" Return="ignore" /> |
94 | 104 |
|
95 | 105 | <util:CloseApplication Id = "TrayRunning" Description="Please exit Red Hat OpenShift Local from tray and run the installation again." Target="crc-tray.exe" RebootPrompt="no" PromptToContinue="yes" />
|
96 | 106 |
|
|
0 commit comments