Fix wix detection

This commit is contained in:
Daniel Sousa 2023-06-14 18:40:47 +01:00
parent b0272722b9
commit fab2cfbdd4

View File

@ -152,13 +152,13 @@ Public Class RDP
End Function End Function
Private Function WixPath() Private Function WixPath()
Dim searchExe = "\candle.exe" Dim searchExe = "candle.exe"
WixPath = "" WixPath = ""
If Not Environment.GetEnvironmentVariable("WIX") = "" Then If Not Environment.GetEnvironmentVariable("WIX") = "" Then
WixPath = Environment.GetEnvironmentVariable("WIX") & "bin" WixPath = Environment.GetEnvironmentVariable("WIX") & "bin"
ElseIf My.Computer.FileSystem.DirectoryExists(My.Application.Info.DirectoryPath & "\wix\" & searchExe) Then ElseIf My.Computer.FileSystem.FileExists(My.Application.Info.DirectoryPath & "\wix\" & searchExe) Then
WixPath = My.Application.Info.DirectoryPath & "\wix" WixPath = My.Application.Info.DirectoryPath & "\wix"
ElseIf My.Computer.FileSystem.DirectoryExists(My.Application.Info.DirectoryPath & "\wix\bin\" & searchExe) Then ElseIf My.Computer.FileSystem.FileExists(My.Application.Info.DirectoryPath & "\wix\bin\" & searchExe) Then
WixPath = My.Application.Info.DirectoryPath & "\wix\bin" WixPath = My.Application.Info.DirectoryPath & "\wix\bin"
End If End If
End Function End Function