summaryrefslogtreecommitdiff
path: root/branding
diff options
context:
space:
mode:
authorkali <kali@win>2021-03-03 22:59:03 +0100
committerkali kaneko (leap communications) <kali@leap.se>2021-03-05 12:16:25 +0100
commit7ed49b92ff19205af276dee371174579c8b4c811 (patch)
treee81ffa631dd2933927b13b2ec55abef061515113 /branding
parenteedc47336e20d2661ed015023aa2e2ddcd5891c4 (diff)
[pkg] abort install if we running an old version0.21.2
stop if: - bitmask is running (we don't want to mess with the helper if the app is running) - we cannot stop the service for some reason. powershell gives more flexibility to stop services, but Remove-Service is not present in PS < 6, so we try to remove the service from the post-install too (the golang helper will complain about an eventlog registry key). this could probably be improved in the helper, but we'll be moving to the official openvpnserv2 service for 0.21.4. we might want to revisit the current helper for the firewall/killswitch.
Diffstat (limited to 'branding')
-rwxr-xr-xbranding/scripts/getparam2
-rw-r--r--branding/templates/qtinstaller/packages/bitmaskvpn/meta/install.js24
2 files changed, 23 insertions, 3 deletions
diff --git a/branding/scripts/getparam b/branding/scripts/getparam
index 235745d..005abb1 100755
--- a/branding/scripts/getparam
+++ b/branding/scripts/getparam
@@ -17,7 +17,7 @@ def getData():
configPath = os.path.join(vendorPath, 'vendor.conf')
if not os.path.isfile(configPath):
print("ERROR: path does not exist", configPath)
- os.exit(1)
+ sys.exit(1)
config = configparser.ConfigParser()
config.read(configPath)
defaultProvider = getDefaultProvider(config)
diff --git a/branding/templates/qtinstaller/packages/bitmaskvpn/meta/install.js b/branding/templates/qtinstaller/packages/bitmaskvpn/meta/install.js
index dada918..b82e032 100644
--- a/branding/templates/qtinstaller/packages/bitmaskvpn/meta/install.js
+++ b/branding/templates/qtinstaller/packages/bitmaskvpn/meta/install.js
@@ -61,6 +61,9 @@ Component.prototype.createOperations = function ()
if (systemInfo.productType === "osx") {
preInstallOSX();
}
+ if (systemInfo.productType === "windows") {
+ preInstallWindows();
+ }
// This will actually install the files
component.createOperations();
@@ -80,11 +83,28 @@ 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.",
+ );
+ /* 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.",
+ );
+}
+
function postInstallWindows() {
// TODO - check if we're on Windows10 or older, and use the needed tap-windows installer accordingly.
console.log("Installing OpenVPN tap driver");
- component.addElevatedOperation("Execute", "@TargetDir@/tap-windows.exe", "/S", "/SELECT_UTILITIES=1"); /* TODO uninstall? */
- console.log("Now trying to install our helper");
+ component.addElevatedOperation("Execute", "@TargetDir@/tap-windows.exe", "/S", "/SELECT_UTILITIES=1"); /* TODO uninstall */
+ /* remove an existing service, if it is stopped. Remove-Service is only in PS>6, and sc.exe delete leaves some garbage on the registry, so let's use the binary itself */
+ console.log("Removing any previously installer helper...");
+ component.addElevatedOperation("Execute", "{0,1}", "@TargetDir@/helper.exe", "remove");
+ console.log("Now trying to install latest helper");
component.addElevatedOperation("Execute", "@TargetDir@/helper.exe", "install", "UNDOEXECUTE", "@TargetDir@/helper.exe", "remove");
component.addElevatedOperation("Execute", "@TargetDir@/helper.exe", "start", "UNDOEXECUTE", "@TargetDir@/helper.exe", "stop");
console.log("Adding shortcut entries/...");