diff options
Diffstat (limited to 'src/leap')
| -rwxr-xr-x | src/leap/bitmask/cli/bitmask_cli.py | 2 | ||||
| -rw-r--r-- | src/leap/bitmask/gui/anonvpn.py | 1 | ||||
| -rw-r--r-- | src/leap/bitmask/gui/app.py | 8 | ||||
| -rw-r--r-- | src/leap/bitmask/vpn/helpers/__init__.py | 6 |
4 files changed, 10 insertions, 7 deletions
diff --git a/src/leap/bitmask/cli/bitmask_cli.py b/src/leap/bitmask/cli/bitmask_cli.py index 57435b8d..9f5b649b 100755 --- a/src/leap/bitmask/cli/bitmask_cli.py +++ b/src/leap/bitmask/cli/bitmask_cli.py @@ -148,7 +148,7 @@ def execute(): def status_timeout(args): raise RuntimeError('bitmaskd is not running') - + if 'status' in sys.arv: timeout_fun = status_timeout else: diff --git a/src/leap/bitmask/gui/anonvpn.py b/src/leap/bitmask/gui/anonvpn.py index b15f7c7f..7912085e 100644 --- a/src/leap/bitmask/gui/anonvpn.py +++ b/src/leap/bitmask/gui/anonvpn.py @@ -55,6 +55,7 @@ def launch_gui(): gui = 'bitmask-systray' subprocess.call([gui]) + def start_app(): global bitmaskd diff --git a/src/leap/bitmask/gui/app.py b/src/leap/bitmask/gui/app.py index ee8e9387..eb34f398 100644 --- a/src/leap/bitmask/gui/app.py +++ b/src/leap/bitmask/gui/app.py @@ -39,7 +39,7 @@ from leap.bitmask.gui.housekeeping import NoAuthTokenError from leap.common.config import get_path_prefix -HAS_WEBENGINE=False +HAS_WEBENGINE = False if platform.system() == 'Windows': from multiprocessing import freeze_support @@ -62,7 +62,7 @@ else: from PyQt5.QtWebEngineWidgets import QWebEngineView as QWebView from PyQt5.QtWebEngineWidgets import QWebEngineSettings as QWebSettings from PyQt5.QtWebChannel import QWebChannel - HAS_WEBENGINE=True + HAS_WEBENGINE = True except ImportError: from PyQt5.QtWebKitWidgets import QWebView from PyQt5.QtWebKit import QWebSettings @@ -167,6 +167,7 @@ class AppBridge(QObject): def openSystemBrowser(self, url): webbrowser.open(url) + pixbrowser = None closing = False @@ -231,6 +232,7 @@ def launch_gui(with_window=True): sys.exit(qApp.exec_()) + usage = '''bitmask [<args>] Launches the Bitmask GUI. @@ -241,7 +243,7 @@ OPTIONAL ARGUMENTS: SEE ALSO: - bitmaskctl controls bitmask daemon from the command line. + bitmaskctl controls bitmask daemon from the command line. ''' diff --git a/src/leap/bitmask/vpn/helpers/__init__.py b/src/leap/bitmask/vpn/helpers/__init__.py index 26567d07..cac4a4ec 100644 --- a/src/leap/bitmask/vpn/helpers/__init__.py +++ b/src/leap/bitmask/vpn/helpers/__init__.py @@ -67,10 +67,10 @@ if IS_LINUX: helper_path_digest = digest(helper_path) if (_exists_and_can_read(BITMASK_ROOT_SYSTEM) and helper_path_digest == digest(BITMASK_ROOT_SYSTEM)): - return True + return True if (_exists_and_can_read(BITMASK_ROOT_LOCAL) and helper_path_digest == digest(BITMASK_ROOT_LOCAL)): - return True + return True return False @@ -91,7 +91,7 @@ if IS_LINUX: openvpn_path_digest = digest(openvpn_path) if (_exists_and_can_read(OPENVPN_LOCAL) and openvpn_path_digest == digest(OPENVPN_LOCAL)): - return True + return True return False |