Fix windows installers

This commit is contained in:
Vladimir Stoilov
2024-12-10 13:46:31 +02:00
parent 5713d7d3c6
commit 3101d0a7aa
4 changed files with 5 additions and 2 deletions

View File

@@ -24,7 +24,6 @@ linters:
- interfacer - interfacer
- ireturn - ireturn
- lll - lll
- mnd
- musttag - musttag
- nestif - nestif
- nilnil - nilnil

View File

@@ -14,7 +14,9 @@
<Component Id="BinaryFiles" Directory="INSTALLDIR" Guid="850cdd31-424d-45f5-b8f0-95df950ebd0d"> <Component Id="BinaryFiles" Directory="INSTALLDIR" Guid="850cdd31-424d-45f5-b8f0-95df950ebd0d">
<File Id="BinIndexJson" Source="..\..\..\..\binary\index.json" /> <File Id="BinIndexJson" Source="..\..\..\..\binary\index.json" />
<File Id="PortmasterCoreExe" Source="..\..\..\..\binary\portmaster-core.exe" /> <File Id="PortmasterCoreExe" Source="..\..\..\..\binary\portmaster-core.exe" />
<File Id="PortmasterCoreDLL" Source="..\..\..\..\binary\portmaster-core.dll" />
<File Id="PortmasterKextSys" Source="..\..\..\..\binary\portmaster-kext.sys" /> <File Id="PortmasterKextSys" Source="..\..\..\..\binary\portmaster-kext.sys" />
<File Id="WebView2Loader" Source="..\..\..\..\binary\WebView2Loader.dll" />
<File Id="PortmasterZip" Source="..\..\..\..\binary\portmaster.zip" /> <File Id="PortmasterZip" Source="..\..\..\..\binary\portmaster.zip" />
<File Id="AssetsZip" Source="..\..\..\..\binary\assets.zip" /> <File Id="AssetsZip" Source="..\..\..\..\binary\assets.zip" />
</Component> </Component>

View File

@@ -6,6 +6,8 @@
File "..\..\..\..\binary\index.json" File "..\..\..\..\binary\index.json"
File "..\..\..\..\binary\portmaster-core.exe" File "..\..\..\..\binary\portmaster-core.exe"
File "..\..\..\..\binary\portmaster-kext.sys" File "..\..\..\..\binary\portmaster-kext.sys"
File "..\..\..\..\binary\portmaster-core.dll"
File "..\..\..\..\binary\WebView2Loader.dll"
File "..\..\..\..\binary\portmaster.zip" File "..\..\..\..\binary\portmaster.zip"
File "..\..\..\..\binary\assets.zip" File "..\..\..\..\binary\assets.zip"

View File

@@ -143,7 +143,7 @@ func updateGlobalConfigProfile(_ context.Context) error {
module.states.Add(mgr.State{ module.states.Add(mgr.State{
ID: globalConfigProfileErrorID, ID: globalConfigProfileErrorID,
Name: "Internal Settings Failure", Name: "Internal Settings Failure",
Message: fmt.Sprintf("Some global settings might not be applied correctly. You can try restarting the Portmaster to resolve this problem. Error: %s", err), Message: fmt.Sprintf("Some global settings might not be applied correctly. You can try restarting the Portmaster to resolve this problem. Error: %s", lastErr),
Type: mgr.StateTypeWarning, Type: mgr.StateTypeWarning,
}) })
} }