From b52cde15c510f163a5b4f05066cbbc0163b8dd55 Mon Sep 17 00:00:00 2001 From: Vladimir Stoilov Date: Fri, 29 Nov 2024 10:53:01 +0200 Subject: [PATCH] [WIP] Fix installers bundle files --- desktop/tauri/src-tauri/tauri.conf.json5 | 8 ++++---- desktop/tauri/src-tauri/templates/files.wxs | 4 ++-- desktop/tauri/src-tauri/templates/nsis_install_hooks.nsh | 4 ++-- packaging/windows/generate_windows_installers.ps1 | 3 ++- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/desktop/tauri/src-tauri/tauri.conf.json5 b/desktop/tauri/src-tauri/tauri.conf.json5 index 5bd85972..464b1071 100644 --- a/desktop/tauri/src-tauri/tauri.conf.json5 +++ b/desktop/tauri/src-tauri/tauri.conf.json5 @@ -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", diff --git a/desktop/tauri/src-tauri/templates/files.wxs b/desktop/tauri/src-tauri/templates/files.wxs index 4828178f..8623e435 100644 --- a/desktop/tauri/src-tauri/templates/files.wxs +++ b/desktop/tauri/src-tauri/templates/files.wxs @@ -12,7 +12,7 @@ - + @@ -20,7 +20,7 @@ - + diff --git a/desktop/tauri/src-tauri/templates/nsis_install_hooks.nsh b/desktop/tauri/src-tauri/templates/nsis_install_hooks.nsh index 6b5afb58..0dd25f0d 100644 --- a/desktop/tauri/src-tauri/templates/nsis_install_hooks.nsh +++ b/desktop/tauri/src-tauri/templates/nsis_install_hooks.nsh @@ -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" diff --git a/packaging/windows/generate_windows_installers.ps1 b/packaging/windows/generate_windows_installers.ps1 index c18a0d1b..407a8cc3 100644 --- a/packaging/windows/generate_windows_installers.ps1 +++ b/packaging/windows/generate_windows_installers.ps1 @@ -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