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

[WIP] Fix installers bundle files

Browse source
This commit is contained in:
Vladimir Stoilov 2024-11-29 10:53:01 +02:00
parent de3f5a8692
commit b52cde15c5
No known key found for this signature in database
GPG key ID: 2F190B67A43A81AF
4 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
desktop/tauri/src-tauri/tauri.conf.json5
View file

@ -63,13 +63,13 @@
"/usr/lib/systemd/system/portmaster.service": "../../../packaging/linux/portmaster.service",
// Binary files
"/usr/lib/portmaster/bin-index.json": "binary/bin-index.json",
"/usr/lib/portmaster/index.json": "binary/index.json",
"/usr/lib/portmaster/portmaster-core": "binary/portmaster-core",
"/usr/lib/portmaster/portmaster.zip": "binary/portmaster.zip",
"/usr/lib/portmaster/assets.zip": "binary/assets.zip",
// Intel files
"/var/lib/portmaster/intel/intel-index.json": "intel/intel-index.json",
"/var/lib/portmaster/intel/index.json": "intel/index.json",
"/var/lib/portmaster/intel/base.dsdl": "intel/base.dsdl",
"/var/lib/portmaster/intel/geoipv4.mmdb": "intel/geoipv4.mmdb",
"/var/lib/portmaster/intel/geoipv6.mmdb": "intel/geoipv6.mmdb",
@ -94,13 +94,13 @@
"/usr/lib/systemd/system/portmaster.service": "../../../packaging/linux/portmaster.service",
// Binary files
"/usr/lib/portmaster/bin-index.json": "binary/bin-index.json",
"/usr/lib/portmaster/index.json": "binary/index.json",
"/usr/lib/portmaster/portmaster-core": "binary/portmaster-core",
"/usr/lib/portmaster/portmaster.zip": "binary/portmaster.zip",
"/usr/lib/portmaster/assets.zip": "binary/assets.zip",
// Intel files
"/var/lib/portmaster/intel/intel-index.json": "intel/intel-index.json",
"/var/lib/portmaster/intel/index.json": "intel/index.json",
"/var/lib/portmaster/intel/base.dsdl": "intel/base.dsdl",
"/var/lib/portmaster/intel/geoipv4.mmdb": "intel/geoipv4.mmdb",
"/var/lib/portmaster/intel/geoipv6.mmdb": "intel/geoipv6.mmdb",

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

@ -12,7 +12,7 @@
<Fragment>
<Component Id="BinaryFiles" Directory="INSTALLDIR" Guid="850cdd31-424d-45f5-b8f0-95df950ebd0d">
<File Id="BinIndexJson" Source="..\..\..\..\binary\bin-index.json" />
<File Id="BinIndexJson" Source="..\..\..\..\binary\index.json" />
<File Id="PortmasterCoreExe" Source="..\..\..\..\binary\portmaster-core.exe" />
<File Id="PortmasterKextSys" Source="..\..\..\..\binary\portmaster-kext.sys" />
<File Id="PortmasterZip" Source="..\..\..\..\binary\portmaster.zip" />
@ -20,7 +20,7 @@
</Component>
<Component Id="IntelFiles" Directory="IntelDir" Guid="0bb439f1-2075-45b0-95bf-78ed3dffeb69">
<File Id="IntelIndexJson" Source="..\..\..\..\intel\intel-index.json" />
<File Id="IntelIndexJson" Source="..\..\..\..\intel\index.json" />
<File Id="BaseDsdl" Source="..\..\..\..\intel\base.dsdl" />
<File Id="Geoipv4Mmdb" Source="..\..\..\..\intel\geoipv4.mmdb" />
<File Id="Geoipv6Mmdb" Source="..\..\..\..\intel\geoipv6.mmdb" />

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

@ -3,7 +3,7 @@
SetOutPath "$INSTDIR"
File "..\..\..\..\binary\bin-index.json"
File "..\..\..\..\binary\index.json"
File "..\..\..\..\binary\portmaster-core.exe"
File "..\..\..\..\binary\portmaster-kext.sys"
File "..\..\..\..\binary\portmaster.zip"
@ -11,7 +11,7 @@
SetOutPath "$COMMONPROGRAMDATA\Portmaster\intel"
File "..\..\..\..\intel\intel-index.json"
File "..\..\..\..\intel\index.json"
File "..\..\..\..\intel\base.dsdl"
File "..\..\..\..\intel\geoipv4.mmdb"
File "..\..\..\..\intel\geoipv6.mmdb"

3
packaging/windows/generate_windows_installers.ps1
View file

@ -53,7 +53,8 @@ if (-not (Get-Command cargo -ErrorAction SilentlyContinue)) {
}
Write-Output "Downloading tauri-cli"
Invoke-WebRequest -Uri https://github.com/tauri-apps/tauri/releases/download/tauri-cli-v2.0.1/cargo-tauri-x86_64-pc-windows-msvc.zip -OutFile tauri-cli.zip
Invoke-WebRequest -Uri https://github.com/tauri-apps/tauri/releases/download/tauri-cli-v2.1.0/cargo-tauri-x86_64-pc-windows-msvc.zip -OutFile tauri-cli.zip
Expand-Archive -Force tauri-cli.zip
./tauri-cli/cargo-tauri.exe bundle