From 1c48e1628c0d148e5afaa1f69f2f961b6d7cc2b0 Mon Sep 17 00:00:00 2001
From: admin <admin@admins-iMac-Pro.local>
Date: Sat, 27 Mar 2021 22:10:53 +0100
Subject: [PATCH] [pkg] fix post-install path in osx
there was a mismatch after latest changes to the plist template
location.
also revert latest osx depends, since some are not installable via
homebrew in osx.
---
Makefile | 4 ++--
.../templates/qtinstaller/osx-data/post-install.py | 10 +++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Makefile b/Makefile
index 904948cf..fcce3d6b 100644
--- a/Makefile
+++ b/Makefile
@@ -78,8 +78,8 @@ dependsLinux:
@# debian needs also: snap install snapcraft --classic; snap install multipass --beta --classic
dependsDarwin:
- @brew install git gpg golang make pkg-config curl qt5
- @brew install --default-names gnu-sed
+ @brew install git golang make qt5
+ #@brew install --default-names gnu-sed
@brew link qt5
dependsCYGWIN_NT-10.0:
diff --git a/branding/templates/qtinstaller/osx-data/post-install.py b/branding/templates/qtinstaller/osx-data/post-install.py
index 83c83705..69b4a810 100755
--- a/branding/templates/qtinstaller/osx-data/post-install.py
+++ b/branding/templates/qtinstaller/osx-data/post-install.py
@@ -71,12 +71,12 @@ def fixHelperOwner(log):
return True
def copyLaunchDaemon():
+ appDir = os.path.join(_dir, _appdir)
plist = "se.leap.bitmask-helper.plist"
- path = os.path.join(_dir, plist)
- _p = os.path.join(_dir, _appdir)
- _p2= _p.replace("/", "\/")
- subprocess.call(["sed", "-i.back", "s/PATH/%s/" % _p2, path])
- shutil.copy(path, HELPER_PLIST)
+ plistFile = os.path.join(appDir, plist)
+ escapedPath = appDir.replace("/", "\/")
+ subprocess.call(["sed", "-i.back", "s/PATH/%s/g" % escapedPath, plistFile])
+ shutil.copy(plistFile, HELPER_PLIST)
def launchHelper():
out = subprocess.call(["launchctl", "load", HELPER_PLIST])
--
GitLab