diff options
| -rw-r--r-- | Makefile | 4 | ||||
| -rwxr-xr-x | branding/templates/qtinstaller/osx-data/post-install.py | 10 |
2 files changed, 7 insertions, 7 deletions
@@ -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 83c8370..69b4a81 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]) |