From 4d9d578902aae37d62ea3218efa2b062cb7f893f Mon Sep 17 00:00:00 2001
From: kali <kali@leap.se>
Date: Thu, 8 Oct 2020 03:04:25 +0200
Subject: [pkg] parametrize win/osx installer

---
 .../packages/root.win_x86_64/.gitignore            |  1 -
 .../packages/root.win_x86_64/meta/installscript.js | 77 ----------------------
 .../packages/root.win_x86_64/meta/package.xml      | 10 ---
 .../qtinstaller/packages/root/meta/package.xml     |  7 --
 4 files changed, 95 deletions(-)
 delete mode 100644 branding/qtinstaller/packages/root.win_x86_64/.gitignore
 delete mode 100644 branding/qtinstaller/packages/root.win_x86_64/meta/installscript.js
 delete mode 100644 branding/qtinstaller/packages/root.win_x86_64/meta/package.xml
 delete mode 100644 branding/qtinstaller/packages/root/meta/package.xml

(limited to 'branding/qtinstaller/packages')

diff --git a/branding/qtinstaller/packages/root.win_x86_64/.gitignore b/branding/qtinstaller/packages/root.win_x86_64/.gitignore
deleted file mode 100644
index 60baa9c..0000000
--- a/branding/qtinstaller/packages/root.win_x86_64/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-data/*
diff --git a/branding/qtinstaller/packages/root.win_x86_64/meta/installscript.js b/branding/qtinstaller/packages/root.win_x86_64/meta/installscript.js
deleted file mode 100644
index 1598458..0000000
--- a/branding/qtinstaller/packages/root.win_x86_64/meta/installscript.js
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
-**
-** Copyright (C) 2020 LEAP Encryption Access Project.
-** 
-*/
-
-function cancelInstaller(message)
-{
-    installer.setDefaultPageVisible(QInstaller.Introduction, false);
-    installer.setDefaultPageVisible(QInstaller.TargetDirectory, false);
-    installer.setDefaultPageVisible(QInstaller.ComponentSelection, false);
-    installer.setDefaultPageVisible(QInstaller.ReadyForInstallation, false);
-    installer.setDefaultPageVisible(QInstaller.StartMenuSelection, false);
-    installer.setDefaultPageVisible(QInstaller.PerformInstallation, false);
-    installer.setDefaultPageVisible(QInstaller.LicenseCheck, false);
-
-    var abortText = "<font color='red'>" + message +"</font>";
-    installer.setValue("FinishedText", abortText);
-}
-function majorVersion(str)
-{
-    return parseInt(str.split(".", 1));
-}
-
-function Component()
-{
-    // Check whether OS is supported.
-    // start installer with -v to see debug output
-
-    console.log("OS: " + systemInfo.productType);
-    console.log("Kernel: " + systemInfo.kernelType + "/" + systemInfo.kernelVersion);
-
-    var validOs = false;
-
-    if (systemInfo.kernelType === "winnt") {
-        if (majorVersion(systemInfo.kernelVersion) >= 6)
-            validOs = true;
-    } else if (systemInfo.kernelType === "darwin") {
-        if (majorVersion(systemInfo.kernelVersion) >= 11)
-            validOs = true;
-    } else {
-        if (systemInfo.productType !== "ubuntu"
-                || systemInfo.productVersion !== "20.04") {
-            QMessageBox["warning"]("os.warning", "Installer",
-                                   "Note that the binaries are only tested on Ubuntu 20.04",
-                                   QMessageBox.Ok);
-        }
-        validOs = true;
-    }
-
-    if (!validOs) {
-        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() 
-{
-	component.createOperations()
-	component.addElevatedOperation("Execute", "@TargetDir@/helper.exe", "install", "UNDOEXECUTE", "@TargetDir@/helper.exe", "remove");
-	component.addElevatedOperation("Execute", "@TargetDir@/helper.exe", "start", "UNDOEXECUTE", "@TargetDir@/helper.exe", "stop");
-        if (systemInfo.productType === "windows") {
-             console.log("Adding shortcut entries");
-             component.addElevatedOperation("Mkdir", "@StartMenuDir@");
-             component.addElevatedOperation("CreateShortcut", "@TargetDir@/demolib-vpn.exe", "@StartMenuDir@/DemoLibVPN.lnk", "workingDirectory=@TargetDir@", "iconPath=@TargetDir@/icon.ico", "description=Start DemoLibVPN");
-
-	     // TODO I think this one is not being created because the path doesn't exist yet. We might want to do this by hooking on the installation finished signal instead.
-             component.addElevatedOperation("CreateShortcut", "@TargetDir@/Uninstall-DemoLibVPN.exe", "@StartMenuDir@/Uninstall.lnk");
-        }
-}
diff --git a/branding/qtinstaller/packages/root.win_x86_64/meta/package.xml b/branding/qtinstaller/packages/root.win_x86_64/meta/package.xml
deleted file mode 100644
index 11d630f..0000000
--- a/branding/qtinstaller/packages/root.win_x86_64/meta/package.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Package>
-	<DisplayName>DemoLibVPN For Windows</DisplayName>
-	<Description>Install DemoLibVPN</Description>
-	<Version>0.0.1-1</Version>
-	<ReleaseDate>2020-09-15</ReleaseDate>
-	<Default>true</Default>
-	<RequiresAdminRights>true</RequiresAdminRights>
-	<Script>installscript.js</Script>
-</Package>
diff --git a/branding/qtinstaller/packages/root/meta/package.xml b/branding/qtinstaller/packages/root/meta/package.xml
deleted file mode 100644
index b4ca25e..0000000
--- a/branding/qtinstaller/packages/root/meta/package.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Package>
-	<DisplayName>DemoLibVPN</DisplayName>
-	<Version>0.0.1-1</Version>
-	<ReleaseDate>2020-09-15</ReleaseDate>
-	<Default>script</Default>
-</Package>
-- 
cgit v1.2.3