vikarti.anatra/safing-portmaster
1
0
Fork 0
mirror of https://github.com/safing/portmaster synced 2025-09-01 18:19:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix windows installers

Browse source
This commit is contained in:
Vladimir Stoilov 2024-12-10 13:46:31 +02:00
parent 5713d7d3c6
commit 3101d0a7aa
No known key found for this signature in database
GPG key ID: 2F190B67A43A81AF
4 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.golangci.yml
View file

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

2
desktop/tauri/src-tauri/templates/files.wxs
View file

@ -14,7 +14,9 @@
<Component Id="BinaryFiles" Directory="INSTALLDIR" Guid="850cdd31-424d-45f5-b8f0-95df950ebd0d">
<File Id="BinIndexJson" Source="..\..\..\..\binary\index.json" />
<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="WebView2Loader" Source="..\..\..\..\binary\WebView2Loader.dll" />
<File Id="PortmasterZip" Source="..\..\..\..\binary\portmaster.zip" />
<File Id="AssetsZip" Source="..\..\..\..\binary\assets.zip" />
</Component>

2
desktop/tauri/src-tauri/templates/nsis_install_hooks.nsh
View file

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

2
service/profile/config-update.go
View file

@ -143,7 +143,7 @@ func updateGlobalConfigProfile(_ context.Context) error {
module.states.Add(mgr.State{
ID: globalConfigProfileErrorID,
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,
})
}