diff options
author | Kali Kaneko (leap communications) <kali@leap.se> | 2017-05-19 14:31:46 +0200 |
---|---|---|
committer | Ruben Pollan <meskio@sindominio.net> | 2017-05-22 12:56:21 +0200 |
commit | 9b415b6423c7dd18fe9ffa302c3343dfa2314619 (patch) | |
tree | 186a80d4c6f1542a24084acafd286fc9385c7fc3 /src/leap/bitmask/vpn/launchers | |
parent | 4c75ff68fe2b629c3f53b51a07ab20e6bfa52bf0 (diff) |
[refactor] remove env code
no need to setup LD_LIBRARY_PATH anymore, we're shipping a static
binary.
Diffstat (limited to 'src/leap/bitmask/vpn/launchers')
-rw-r--r-- | src/leap/bitmask/vpn/launchers/darwin.py | 15 | ||||
-rw-r--r-- | src/leap/bitmask/vpn/launchers/linux.py | 15 |
2 files changed, 0 insertions, 30 deletions
diff --git a/src/leap/bitmask/vpn/launchers/darwin.py b/src/leap/bitmask/vpn/launchers/darwin.py index 9ae6405..3d77e18 100644 --- a/src/leap/bitmask/vpn/launchers/darwin.py +++ b/src/leap/bitmask/vpn/launchers/darwin.py @@ -182,18 +182,3 @@ class DarwinVPNLauncher(VPNLauncher): command.extend(['--setenv', "LEAPUSER", getpass.getuser()]) return command - - @classmethod - def get_vpn_env(kls): - """ - Returns a dictionary with the custom env for the platform. - This is mainly used for setting LD_LIBRARY_PATH to the correct - path when distributing a standalone client - - :rtype: dict - """ - ld_library_path = os.path.join(get_path_prefix(), "..", "lib") - ld_library_path.encode(sys.getfilesystemencoding()) - return { - "DYLD_LIBRARY_PATH": ld_library_path - } diff --git a/src/leap/bitmask/vpn/launchers/linux.py b/src/leap/bitmask/vpn/launchers/linux.py index f8bb8ed..5852d1e 100644 --- a/src/leap/bitmask/vpn/launchers/linux.py +++ b/src/leap/bitmask/vpn/launchers/linux.py @@ -153,18 +153,3 @@ class LinuxVPNLauncher(VPNLauncher): cmd += 'chmod 744 "%s"\n' % (openvpn_bin_path, ) return cmd - - @classmethod - def get_vpn_env(kls): - """ - Returns a dictionary with the custom env for the platform. - This is mainly used for setting LD_LIBRARY_PATH to the correct - path when distributing a standalone client - - :rtype: dict - """ - ld_library_path = os.path.join(get_path_prefix(), "..", "lib") - ld_library_path.encode(sys.getfilesystemencoding()) - return { - "LD_LIBRARY_PATH": ld_library_path - } |