Unverified Commit 1c48e162 authored by admin's avatar admin Committed by Kali Kaneko
Browse files

[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.
parent 4d3550ea
Pipeline #56308 passed with stages
in 15 minutes and 16 seconds
......@@ -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:
......
......@@ -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])
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment