zabpehely
/
remoteapptool
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #84 from danielb7390/master 

Fix wix detection
This commit is contained in:
Kim Knight 2023-06-16 23:01:23 +10:00 committed by GitHub
parent b0272722b9 fab2cfbdd4
commit 64f05f4a8f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
RDP2MSILib/RDP2MSILib.vb
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