From 5c4a4b792a4c724e5cdeeebb854868b8ee1c4cfd Mon Sep 17 00:00:00 2001
From: "kali kaneko (leap communications)" <kali@leap.se>
Date: Fri, 5 Mar 2021 12:32:16 +0100
Subject: [PATCH] [style] fmt
---
.../packages/bitmaskvpn/meta/install.js | 34 +++++++++----------
docs/build.windows.rst | 7 +++-
2 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/branding/templates/qtinstaller/packages/bitmaskvpn/meta/install.js b/branding/templates/qtinstaller/packages/bitmaskvpn/meta/install.js
index b82e0326..b97d0a79 100644
--- a/branding/templates/qtinstaller/packages/bitmaskvpn/meta/install.js
+++ b/branding/templates/qtinstaller/packages/bitmaskvpn/meta/install.js
@@ -62,7 +62,7 @@ Component.prototype.createOperations = function ()
preInstallOSX();
}
if (systemInfo.productType === "windows") {
- preInstallWindows();
+ preInstallWindows();
}
// This will actually install the files
component.createOperations();
@@ -86,14 +86,14 @@ Component.prototype.createOperations = function ()
function preInstallWindows() {
console.log("Pre-installation for Windows: check for running bitmask");
component.addOperation(
- "Execute", "{1}", "powershell", "-NonInteractive", "-NoProfile", "-command", "try {Get-Process $BINNAME} catch { exit 1}",
- "errormessage=It seems that an old RiseupVPN client is running. Please exit the app and run this installer again.",
+ "Execute", "{1}", "powershell", "-NonInteractive", "-NoProfile", "-command", "try {Get-Process $BINNAME} catch { exit 1}",
+ "errormessage=It seems that an old RiseupVPN client is running. Please exit the app and run this installer again.",
);
/* Remove-Service only introduced in PS 6.0 */
component.addElevatedOperation(
- "Execute", "{0}", "powershell", "-NonInteractive", "-NoProfile", "-command",
- "try {Get-Service bitmask-helper-v2} catch {exit 0}; try {Stop-Service bitmask-helper-v2} catch {}; try {$$srv = Get-Service bitmask-helper-v2; if ($$srv.Status -eq 'Running') {exit 1} else {exit 0};} catch {exit 0}",
- "errormessage=It seems that bitmask-helper-v2 service is running, and we could not stop it. Please manually uninstall any previous RiseupVPN or CalyxVPN client and run this installer again.",
+ "Execute", "{0}", "powershell", "-NonInteractive", "-NoProfile", "-command",
+ "try {Get-Service bitmask-helper-v2} catch {exit 0}; try {Stop-Service bitmask-helper-v2} catch {}; try {$$srv = Get-Service bitmask-helper-v2; if ($$srv.Status -eq 'Running') {exit 1} else {exit 0};} catch {exit 0}",
+ "errormessage=It seems that bitmask-helper-v2 service is running, and we could not stop it. Please manually uninstall any previous RiseupVPN or CalyxVPN client and run this installer again.",
);
}
@@ -122,14 +122,14 @@ function postInstallWindows() {
function preInstallOSX() {
console.log("Pre-installation for OSX: check for running bitmask");
component.addOperation(
- "Execute", "{1}", "pgrep", "bitmask-vpn$$", /* $$$$ is escaped by python template: the old app binary was called bitmask-vpn */
- "errormessage=It seems that an old RiseupVPN client is running. Please exit the app and run this installer again.",
+ "Execute", "{1}", "pgrep", "bitmask-vpn$$", /* $$$$ is escaped by python template: the old app binary was called bitmask-vpn */
+ "errormessage=It seems that an old RiseupVPN client is running. Please exit the app and run this installer again.",
);
component.addOperation(
- "Execute", "{1}", "pgrep", "bitmask$$", /* $$$$ is escaped by python template: we don't want to catch bitmask app */
- "errormessage=It seems RiseupVPN, CalyxVPN or LibraryVPN are running. Please exit the app and run this installer again.",
+ "Execute", "{1}", "pgrep", "bitmask$$", /* $$$$ is escaped by python template: we don't want to catch bitmask app */
+ "errormessage=It seems RiseupVPN, CalyxVPN or LibraryVPN are running. Please exit the app and run this installer again.",
"UNDOEXECUTE", "{1}", "pgrep", "bitmask$$", /* $$$$ is escaped: we dont want bitmask app */
- "errormessage=It seems RiseupVPN, CalyxVPN or LibraryVPN are running. Please exit the app before trying to run the uninstaller again."
+ "errormessage=It seems RiseupVPN, CalyxVPN or LibraryVPN are running. Please exit the app before trying to run the uninstaller again."
);
}
@@ -137,18 +137,18 @@ function uninstallOSX() {
console.log("Pre-installation for OSX: uninstall previous helpers");
// TODO use installer filepath??
component.addElevatedOperation(
- "Execute", "{0}",
- "@TargetDir@/uninstall.py", "pre",
- "errormessage=There was an error during the pre-installation script, things might be broken. Please report this error and attach /tmp/bitmask-uninstall.log"
+ "Execute", "{0}",
+ "@TargetDir@/uninstall.py", "pre",
+ "errormessage=There was an error during the pre-installation script, things might be broken. Please report this error and attach /tmp/bitmask-uninstall.log"
);
}
function postInstallOSX() {
console.log("Post-installation for OSX");
component.addElevatedOperation(
- "Execute", "{0}",
- "@TargetDir@/post-install.py",
- "errormessage=There was an error during the post-installation script, things might be broken. Please report this error and attach the post-install.log file.",
+ "Execute", "{0}",
+ "@TargetDir@/post-install.py",
+ "errormessage=There was an error during the post-installation script, things might be broken. Please report this error and attach the post-install.log file.",
"UNDOEXECUTE",
"@TargetDir@/uninstall.py"
);
diff --git a/docs/build.windows.rst b/docs/build.windows.rst
index a24f4b0b..1e65c27b 100644
--- a/docs/build.windows.rst
+++ b/docs/build.windows.rst
@@ -15,8 +15,13 @@ Assuming you have the vendor path in place and correctly configured, all you nee
export PATH="/c/Qt/Qt5/bin/":"/c/Qt/QtIFW-3.2.2/bin":$PATH
export VENDOR_PATH=providers
export PROVIDER=riseup
+ make generate # FIXME this is not called in win
make vendor && make installer
+If you're doing a final release::
+
+ export RELEASE=yes
+
checking signatures
-------------------
@@ -42,7 +47,7 @@ the steps to do release signatures are::
make installer
make sign_installer
-or alltogether as::
+or all together as::
make package_win_release
--
GitLab