From ef080cc3fbcd7bd6a30eee860245d384b7d6cc2c Mon Sep 17 00:00:00 2001 From: Alexandr Stelnykovych Date: Fri, 14 Mar 2025 00:08:51 +0200 Subject: [PATCH] [packaging] Added missing intel artifacts to installers --- desktop/tauri/src-tauri/tauri.conf.json5 | 8 ++++++++ desktop/tauri/src-tauri/templates/nsis/install_hooks.nsh | 6 ++++++ desktop/tauri/src-tauri/templates/wix/files.wxs | 3 +++ 3 files changed, 17 insertions(+) diff --git a/desktop/tauri/src-tauri/tauri.conf.json5 b/desktop/tauri/src-tauri/tauri.conf.json5 index 28b9f772..3be680df 100644 --- a/desktop/tauri/src-tauri/tauri.conf.json5 +++ b/desktop/tauri/src-tauri/tauri.conf.json5 @@ -76,6 +76,10 @@ "/var/lib/portmaster/intel/intermediate.dsdl": "intel/intermediate.dsdl", "/var/lib/portmaster/intel/urgent.dsdl": "intel/urgent.dsdl", + "/var/lib/portmaster/intel/main-intel.yaml" : "intel/main-intel.yaml", + "/var/lib/portmaster/intel/notifications.yaml": "intel/notifications.yaml", + "/var/lib/portmaster/intel/news.yaml" : "intel/news.yaml", + // Shortcut "/etc/xdg/autostart/portmaster.desktop": "../../../packaging/linux/portmaster-autostart.desktop" }, @@ -106,6 +110,10 @@ "/var/lib/portmaster/intel/intermediate.dsdl": "intel/intermediate.dsdl", "/var/lib/portmaster/intel/urgent.dsdl": "intel/urgent.dsdl", + "/var/lib/portmaster/intel/main-intel.yaml" : "intel/main-intel.yaml", + "/var/lib/portmaster/intel/notifications.yaml": "intel/notifications.yaml", + "/var/lib/portmaster/intel/news.yaml" : "intel/news.yaml", + // Shortcut "/etc/xdg/autostart/portmaster.desktop": "../../../packaging/linux/portmaster-autostart.desktop" }, diff --git a/desktop/tauri/src-tauri/templates/nsis/install_hooks.nsh b/desktop/tauri/src-tauri/templates/nsis/install_hooks.nsh index 24a543c9..00023049 100644 --- a/desktop/tauri/src-tauri/templates/nsis/install_hooks.nsh +++ b/desktop/tauri/src-tauri/templates/nsis/install_hooks.nsh @@ -33,6 +33,9 @@ var dataDir File "..\..\..\..\intel\index.dsd" File "..\..\..\..\intel\intermediate.dsdl" File "..\..\..\..\intel\urgent.dsdl" + File "..\..\..\..\intel\main-intel.yaml" + File "..\..\..\..\intel\notifications.yaml" + File "..\..\..\..\intel\news.yaml" ; restire previous state SetOutPath "$INSTDIR" @@ -149,6 +152,9 @@ var dataDir Delete /REBOOTOK "$COMMONPROGRAMDATA\Portmaster\intel\index.dsd" Delete /REBOOTOK "$COMMONPROGRAMDATA\Portmaster\intel\intermediate.dsdl" Delete /REBOOTOK "$COMMONPROGRAMDATA\Portmaster\intel\urgent.dsdl" + Delete /REBOOTOK "$COMMONPROGRAMDATA\Portmaster\intel\main-intel.yaml" + Delete /REBOOTOK "$COMMONPROGRAMDATA\Portmaster\intel\notifications.yaml" + Delete /REBOOTOK "$COMMONPROGRAMDATA\Portmaster\intel\news.yaml" RMDir /r /REBOOTOK "$COMMONPROGRAMDATA\Portmaster\intel" ${If} $DeleteAppDataCheckboxState = 1 diff --git a/desktop/tauri/src-tauri/templates/wix/files.wxs b/desktop/tauri/src-tauri/templates/wix/files.wxs index 70000ee4..1e5bb49c 100644 --- a/desktop/tauri/src-tauri/templates/wix/files.wxs +++ b/desktop/tauri/src-tauri/templates/wix/files.wxs @@ -27,6 +27,9 @@ + + +