summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2016-03-09 16:27:36 -0400
committerKali Kaneko <kali@leap.se>2016-04-19 10:00:03 -0400
commit449bb9f2336d2f50a63d8558d1198b64b1ec4814 (patch)
tree0b267780dc49849beb224fa92a2c112b68cea021 /src
parentb546d64221f5c10d7ec076fd278b7e60c3fb6f31 (diff)
[pkg] adapt launcher to work inside frozen binary
Diffstat (limited to 'src')
-rw-r--r--src/leap/bitmask/core/launcher.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/leap/bitmask/core/launcher.py b/src/leap/bitmask/core/launcher.py
index e363046e..b2319077 100644
--- a/src/leap/bitmask/core/launcher.py
+++ b/src/leap/bitmask/core/launcher.py
@@ -18,9 +18,10 @@
Run bitmask daemon.
"""
from twisted.scripts.twistd import run
-from os.path import join, dirname
+from os.path import join
from sys import argv
+from leap.bitmask.util import here
from leap.bitmask import core
@@ -28,7 +29,7 @@ def run_bitmaskd():
# TODO --- configure where to put the logs... (get --logfile, --logdir
# from the bitmask_cli
argv[1:] = [
- '-y', join(dirname(core.__file__), "bitmaskd.tac"),
+ '-y', join(here(core), "bitmaskd.tac"),
'--pidfile', '/tmp/bitmaskd.pid',
'--logfile', '/tmp/bitmaskd.log',
'--umask=0022',