diff options
| author | Kali Kaneko <kali@leap.se> | 2018-02-19 19:14:22 +0100 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2018-02-19 19:37:43 +0100 |
| commit | 6de3b4b1fb22a503fe04b3e5678a45aa81657c55 (patch) | |
| tree | 7a05dfe99e761246708d7183aada662e2148f5c6 /src/leap/bitmask | |
| parent | 89dbc2c7b7f6c41b5520c3633d1f90ddb0162f37 (diff) | |
[pkg] osx packaging changes for riseupvpn
Diffstat (limited to 'src/leap/bitmask')
| -rw-r--r-- | src/leap/bitmask/gui/anonvpn.py | 3 | ||||
| -rw-r--r-- | src/leap/bitmask/vpn/launchers/darwin.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/leap/bitmask/gui/anonvpn.py b/src/leap/bitmask/gui/anonvpn.py index 3c1d0458..4884510f 100644 --- a/src/leap/bitmask/gui/anonvpn.py +++ b/src/leap/bitmask/gui/anonvpn.py @@ -30,6 +30,7 @@ import sys from functools import partial from multiprocessing import Process +from leap.bitmask.util import here from leap.bitmask.core.launcher import run_bitmaskd, pid from leap.bitmask.gui.housekeeping import cleanup, terminate, reset_authtoken from leap.bitmask.gui.housekeeping import check_stale_pidfile @@ -43,7 +44,7 @@ bitmaskd = None def launch_gui(): from leap.bitmask.util import STANDALONE if STANDALONE: - gui = './bitmask-systray' + gui = os.path.join(here(), 'bitmask-systray') else: gui = 'bitmask-systray' subprocess.call([gui]) diff --git a/src/leap/bitmask/vpn/launchers/darwin.py b/src/leap/bitmask/vpn/launchers/darwin.py index e454a2ff..03393da2 100644 --- a/src/leap/bitmask/vpn/launchers/darwin.py +++ b/src/leap/bitmask/vpn/launchers/darwin.py @@ -43,7 +43,7 @@ class HelperCommand(object): try: self._sock.connect(self.SOCKET_ADDR) except socket.error, msg: - raise RuntimeError(msg) + raise RuntimeError('Cannot connect to helper: ' + msg) def send(self, cmd, args=''): self._connect() |