diff options
| author | Kali Kaneko <kali@leap.se> | 2014-06-16 18:50:09 -0500 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2014-06-17 11:16:04 -0500 |
| commit | 9dd06067e6bfa475c633a1edcae8d3c318b9f0f5 (patch) | |
| tree | 03dfca6ca8d92024f57c93756db27ff959f4b0a4 | |
| parent | a1ed7ee69fc76a978c2ed9a85593492e596689bd (diff) | |
use absolute paths
| -rw-r--r-- | src/leap/bitmask/platform_init/initializers.py | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/leap/bitmask/platform_init/initializers.py b/src/leap/bitmask/platform_init/initializers.py index 79fdd554..859e7fe6 100644 --- a/src/leap/bitmask/platform_init/initializers.py +++ b/src/leap/bitmask/platform_init/initializers.py @@ -248,13 +248,13 @@ def _darwin_install_missing_scripts(badexec, notfound): # We expect to execute this from some way of bundle, since # the up/down scripts should be put in place by the installer. success = False - installer_path = os.path.join( - os.getcwd(), - "..", - "Resources", - "openvpn") + installer_path = os.path.abspath( + os.path.join( + os.getcwd(), "..", "Resources", "openvpn")) launcher = DarwinVPNLauncher + + # XXX FIXME !!! call the bash script! if os.path.isdir(installer_path): fd, tempscript = tempfile.mkstemp(prefix="leap_installer-") try: @@ -397,12 +397,15 @@ def _linux_install_missing_scripts(badexec, notfound): :rtype: bool """ success = False - installer_path = os.path.join(os.getcwd(), "apps", "eip", "files") + installer_path = os.path.abspath( + os.path.join(os.getcwd(), "apps", "eip", "files")) launcher = LinuxVPNLauncher # XXX refactor with darwin, same block. if os.path.isdir(installer_path): + + # FIXME --------- call installer script --- fd, tempscript = tempfile.mkstemp(prefix="leap_installer-") polfd, pol_tempfile = tempfile.mkstemp(prefix="leap_installer-") try: |