From e4a2efb527fb09b548c14b13d28d0780941ca72d Mon Sep 17 00:00:00 2001
From: kali <kali@win>
Date: Fri, 9 Oct 2020 12:39:27 +0200
Subject: [pkg] windows fixes

Several fixes for missing paths. Refactor qt installer; fetch pre-built
binaries from an existing installation on build system (needs to be
automated); add windows icon.

- Resolves: #362
---
 branding/templates/qtinstaller/config/config.xml                    | 2 +-
 branding/templates/qtinstaller/packages/bitmaskvpn/meta/install.js  | 5 -----
 branding/templates/qtinstaller/packages/bitmaskvpn/meta/package.xml | 2 +-
 3 files changed, 2 insertions(+), 7 deletions(-)

(limited to 'branding/templates/qtinstaller')

diff --git a/branding/templates/qtinstaller/config/config.xml b/branding/templates/qtinstaller/config/config.xml
index c02b0a6..70ce9f6 100644
--- a/branding/templates/qtinstaller/config/config.xml
+++ b/branding/templates/qtinstaller/config/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Installer>
-    <Name>$APPNAME-$VERSION</Name>
+    <Name>$APPNAME</Name>
     <Version>$VERSION</Version>
     <Title>$APPNAME Installer ($VERSION)</Title>
     <Publisher>LEAP Encryption Access Project</Publisher>
diff --git a/branding/templates/qtinstaller/packages/bitmaskvpn/meta/install.js b/branding/templates/qtinstaller/packages/bitmaskvpn/meta/install.js
index 361e14d..d69f262 100644
--- a/branding/templates/qtinstaller/packages/bitmaskvpn/meta/install.js
+++ b/branding/templates/qtinstaller/packages/bitmaskvpn/meta/install.js
@@ -52,13 +52,8 @@ function Component() {
         cancelInstaller("Installation on " + systemInfo.prettyProductName + " is not supported");
         return;
     }
-
     console.log("CPU Architecture: " +  systemInfo.currentCpuArchitecture);
 
-    if ( systemInfo.kernelType === "winnt") {
-        installer.componentByName("root.win_x86_64").setValue("Default", "true");
-        installer.componentByName("root.win_x86_64").setValue("Virtual", "false");
-    }
 }
 
 Component.prototype.createOperations = function ()
diff --git a/branding/templates/qtinstaller/packages/bitmaskvpn/meta/package.xml b/branding/templates/qtinstaller/packages/bitmaskvpn/meta/package.xml
index 0e56f4f..d54cf56 100644
--- a/branding/templates/qtinstaller/packages/bitmaskvpn/meta/package.xml
+++ b/branding/templates/qtinstaller/packages/bitmaskvpn/meta/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Package>
     <DisplayName>$APPNAME</DisplayName>
-    <Description>$APPNAME</Description>
+    <Description>$APPNAME_PLATFORM</Description>
     <Version>$VERSION</Version>
     <ReleaseDate>$TIMESTAMP</ReleaseDate>
     <Default>false</Default>
-- 
cgit v1.2.3