From 4a4b6b46f84c28640c711655f4f3c339ccf8fbba Mon Sep 17 00:00:00 2001
From: kali <kali@leap.se>
Date: Fri, 19 Feb 2021 12:20:55 +0100
Subject: [pkg] improve osx installer

- install into global /Applications
- document how to troubleshoot helper
- uninstall app is visible on top-level folder
- improve detection of running processes for old and new binaries

- Closes: #441
- Closes: #445
- Closes: #435
---
 .../templates/qtinstaller/osx-data/post-install.py | 26 +++++++++++-----------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'branding/templates/qtinstaller/osx-data/post-install.py')

diff --git a/branding/templates/qtinstaller/osx-data/post-install.py b/branding/templates/qtinstaller/osx-data/post-install.py
index 2c15845..83c8370 100755
--- a/branding/templates/qtinstaller/osx-data/post-install.py
+++ b/branding/templates/qtinstaller/osx-data/post-install.py
@@ -5,15 +5,18 @@
 # This means that, for the time being, you can only install ONE of the BitmaskVPN derivatives at the same time.
 # This might change in the future.
 
+import glob
 import os
 import shutil
 import sys
 import subprocess
+import time
 
 HELPER = "bitmask-helper"
 HELPER_PLIST = "/Library/LaunchDaemons/se.leap.bitmask-helper.plist"
 
 _dir = os.path.dirname(os.path.realpath(__file__))
+_appdir = glob.glob('{}/*VPN.app'.format(_dir))[0]
 
 def main():
     log = open(os.path.join(_dir, 'post-install.log'), 'w')
@@ -21,10 +24,9 @@ def main():
 
     _id = os.getuid()
     if _id != 0:
-      err  = "error: need to run as root. UID: %s\n" % str(_id)
-      logErr(log, err)
-    
-    # failure: sys.exit(1)
+      err  = "ERROR: need to run as root. UID: %s\n" % str(_id)
+      log.write(err)
+      sys.exit(1)
     
     if isHelperRunning():
         log.write("Trying to stop bitmask-helper...\n")
@@ -48,22 +50,19 @@ def main():
     log.write('post-install script: done\n')
     sys.exit(0)
 
-
-def logErr(log, msg):
-    log.write(msg)
-    sys.exit(1)
-
 def isHelperRunning():
     ps = _getProcessList()
     return HELPER in ps 
 
 def unloadHelper():
     out = subprocess.call(["launchctl", "unload", HELPER_PLIST])
+    time.sleep(0.5)
     out2 = subprocess.call(["pkill", "-9", "bitmask-helper"])  # just in case
+    time.sleep(0.5)
     return out == 0
 
 def fixHelperOwner(log):
-    path = os.path.join(_dir, HELPER)
+    path = os.path.join(_appdir, HELPER)
     try:
         os.chown(path, 0, 0)
     except OSError as exc:
@@ -74,8 +73,9 @@ def fixHelperOwner(log):
 def copyLaunchDaemon():
     plist = "se.leap.bitmask-helper.plist"
     path = os.path.join(_dir, plist)
-    _p = _dir.replace("/", "\/")
-    subprocess.call(["sed", "-i.back", "s/PATH/%s/" % _p, path])
+    _p = os.path.join(_dir, _appdir)
+    _p2= _p.replace("/", "\/")
+    subprocess.call(["sed", "-i.back", "s/PATH/%s/" % _p2, path])
     shutil.copy(path, HELPER_PLIST)
 
 def launchHelper():
@@ -83,7 +83,7 @@ def launchHelper():
     return out == 0
 
 def grantPermissionsOnLogFolder():
-    helperDir = os.path.join(_dir, 'helper')
+    helperDir = os.path.join(_appdir, 'helper')
     try:
         os.makedirs(helperDir)
     except Exception:
-- 
cgit v1.2.3