diff options
| author | Kali Kaneko <kali@leap.se> | 2017-06-20 03:18:54 -0700 |
|---|---|---|
| committer | Kali Kaneko (leap communications) <kali@leap.se> | 2017-06-21 02:56:10 +0200 |
| commit | c82f23ccaf077dce350292c7f3b2948d61122bbe (patch) | |
| tree | f28e03a6c9fd3790782b4941cf8ffe38f3c1b834 /src/leap/bitmask/vpn/helpers/osx/bitmask-helper | |
| parent | 51011053093c87ca7ff2e024734578a5dce0dbfa (diff) | |
[pkg] improve Packages script
- use relative paths
- there's still an absolute path (hardcoded, the REFERENCE FOLDER PATH).
This should be changed (sed!) if we want to automate this for CI or for
building in different environments: STILL NEEDS SOME MANUAL WORK.
- Avoid deleting the build folders by default
- Move the plist file to a subfolder
Diffstat (limited to 'src/leap/bitmask/vpn/helpers/osx/bitmask-helper')
| -rwxr-xr-x | src/leap/bitmask/vpn/helpers/osx/bitmask-helper | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/leap/bitmask/vpn/helpers/osx/bitmask-helper b/src/leap/bitmask/vpn/helpers/osx/bitmask-helper index 74f72f7f..7795ba2b 100755 --- a/src/leap/bitmask/vpn/helpers/osx/bitmask-helper +++ b/src/leap/bitmask/vpn/helpers/osx/bitmask-helper @@ -189,7 +189,7 @@ def handle_command(sock): } cmd_call = cmd_dict.get(command, None) - syslog.syslog(syslog.LOG_WARNING, 'call: %s' % (str(cmd_call))) + # syslog.syslog(syslog.LOG_WARNING, 'call: %s' % (str(cmd_call))) try: if cmd_call: syslog.syslog( @@ -248,11 +248,15 @@ def openvpn_start(*args): binary = ['/usr/local/sbin/openvpn'] cmd = binary + opts - # syslog.syslog(syslog.LOG_WARNING, 'LAUNCHING VPN: ' + ' '.join(cmd)) + syslog.syslog(syslog.LOG_WARNING, 'LAUNCHING VPN: ' + ' '.join(cmd)) global openvpn_proc # TODO sanitize options openvpn_proc = subprocess.Popen(cmd, shell=False, bufsize=-1) + # try: + # result = subprocess.check_output(cmd, shell=False, stderr=subprocess.STDOUT) + # except Exception as exc: + # syslog.syslog(syslog.LOG_WARNING, exc.output) def openvpn_stop(sig='TERM'): |