From 9b415b6423c7dd18fe9ffa302c3343dfa2314619 Mon Sep 17 00:00:00 2001 From: "Kali Kaneko (leap communications)" Date: Fri, 19 May 2017 14:31:46 +0200 Subject: [refactor] remove env code no need to setup LD_LIBRARY_PATH anymore, we're shipping a static binary. --- src/leap/bitmask/vpn/launchers/darwin.py | 15 --------------- src/leap/bitmask/vpn/launchers/linux.py | 15 --------------- 2 files changed, 30 deletions(-) (limited to 'src/leap/bitmask/vpn/launchers') diff --git a/src/leap/bitmask/vpn/launchers/darwin.py b/src/leap/bitmask/vpn/launchers/darwin.py index 9ae64053..3d77e186 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 f8bb8ed3..5852d1e5 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 - } -- cgit v1.2.3