summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko (leap communications) <kali@leap.se>2017-02-01 16:55:51 +0100
committerKali Kaneko (leap communications) <kali@leap.se>2017-02-23 00:40:33 +0100
commitb509a5f353f706fab31189b352d6ffa24bd1c3e5 (patch)
treeb718ec49865195926d6809d6c5ba680f89c9e6e4
parentef57df5a4791f81871f2da42c1bb3086d0ed0815 (diff)
[bug] fix bitmask-root path
-rw-r--r--src/leap/bitmask/cli/eip.py5
-rw-r--r--src/leap/bitmask/vpn/launchers/linux.py10
2 files changed, 11 insertions, 4 deletions
diff --git a/src/leap/bitmask/cli/eip.py b/src/leap/bitmask/cli/eip.py
index 5fb240c..b7016ef 100644
--- a/src/leap/bitmask/cli/eip.py
+++ b/src/leap/bitmask/cli/eip.py
@@ -30,11 +30,12 @@ SUBCOMMANDS:
enable Enable EIP Service
disable Disable EIP Service
- check Check whether EIP service is properly configured
- get_cert Get EIP Certificate from provider
start Start EIP
stop Stop EIP
status Display status about service
+ check Check whether EIP service is properly configured
+ get_cert Get EIP Certificate from provider
+ install Install helpers (need superuser)
'''.format(name=command.appname)
diff --git a/src/leap/bitmask/vpn/launchers/linux.py b/src/leap/bitmask/vpn/launchers/linux.py
index d39b3b1..f99c5c7 100644
--- a/src/leap/bitmask/vpn/launchers/linux.py
+++ b/src/leap/bitmask/vpn/launchers/linux.py
@@ -59,8 +59,14 @@ class LinuxVPNLauncher(VPNLauncher):
class BITMASK_ROOT(object):
def __call__(self):
- return ("/usr/local/sbin/bitmask-root" if flags_STANDALONE else
- "/usr/sbin/bitmask-root")
+ _global = '/usr/sbin/bitmask-root'
+ _local = '/usr/local/sbin/bitmask-root'
+ if os.path.isfile(_global):
+ return _global
+ elif os.path.isfile(_local):
+ return _local
+ else:
+ return 'bitmask-root'
class OPENVPN_BIN_PATH(object):
def __call__(self):