summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/platform_init
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-09-30 11:50:15 -0300
committerTomás Touceda <chiiph@leap.se>2013-09-30 11:50:15 -0300
commit4a4c9b91a8b62729e14c68ff99a51ca8f50cc3b3 (patch)
tree3516d1628b5c78ebe3459ae2494260060fadbac0 /src/leap/bitmask/platform_init
parentac502ce982de1191a0af89683db517fe7c90914b (diff)
parentd4df128d1e5b452eb3f8de88174991fafd70913a (diff)
Merge remote-tracking branch 'ivan/feature/refactor-vpnlaunchers' into develop
Diffstat (limited to 'src/leap/bitmask/platform_init')
-rw-r--r--src/leap/bitmask/platform_init/initializers.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/leap/bitmask/platform_init/initializers.py b/src/leap/bitmask/platform_init/initializers.py
index 831c6a1c..d93efbc6 100644
--- a/src/leap/bitmask/platform_init/initializers.py
+++ b/src/leap/bitmask/platform_init/initializers.py
@@ -29,7 +29,9 @@ import tempfile
from PySide import QtGui
from leap.bitmask.config.leapsettings import LeapSettings
-from leap.bitmask.services.eip import vpnlaunchers
+from leap.bitmask.services.eip import get_vpn_launcher
+from leap.bitmask.services.eip.linuxvpnlauncher import LinuxVPNLauncher
+from leap.bitmask.services.eip.darwinvpnlauncher import DarwinVPNLauncher
from leap.bitmask.util import first
from leap.bitmask.util import privilege_policies
@@ -106,7 +108,7 @@ def check_missing():
config = LeapSettings()
alert_missing = config.get_alert_missing_scripts()
- launcher = vpnlaunchers.get_platform_launcher()
+ launcher = get_vpn_launcher()
missing_scripts = launcher.missing_updown_scripts
missing_other = launcher.missing_other_files
@@ -251,7 +253,7 @@ def _darwin_install_missing_scripts(badexec, notfound):
"..",
"Resources",
"openvpn")
- launcher = vpnlaunchers.DarwinVPNLauncher
+ launcher = DarwinVPNLauncher
if os.path.isdir(installer_path):
fd, tempscript = tempfile.mkstemp(prefix="leap_installer-")
@@ -356,7 +358,7 @@ def _linux_install_missing_scripts(badexec, notfound):
"""
success = False
installer_path = os.path.join(os.getcwd(), "apps", "eip", "files")
- launcher = vpnlaunchers.LinuxVPNLauncher
+ launcher = LinuxVPNLauncher
# XXX refactor with darwin, same block.