From 0e96c7c6153658ec1e726bd35879c81825e1fac1 Mon Sep 17 00:00:00 2001 From: Geoffrey Frogeye Date: Thu, 25 Feb 2016 17:17:03 +0100 Subject: [PATCH] Tunnel prevent message when Ctrl+C --- scripts/tunnel | 45 ++++++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/scripts/tunnel b/scripts/tunnel index ff274f0..2264835 100755 --- a/scripts/tunnel +++ b/scripts/tunnel @@ -1,29 +1,32 @@ #!/usr/bin/env python3 -import sys -import os -from subprocess import call +try: + import sys + import os + from subprocess import call -host, port = sys.argv[1:3] -proxy = os.environ.get('HTTP_PROXY') + host, port = sys.argv[1:3] + proxy = os.environ.get('HTTP_PROXY') -if proxy: - proxy = proxy.strip('/') - if proxy[:7] == 'http://': - proxy = proxy[7:] - elif proxy[:8] == 'https://': - proxy = proxy[8:] - s = proxy.split('@') - user = None - if len(s) == 2: - user, proxy = s - args = ['proxytunnel', '-p', proxy, '-d', host + ':' + port] - if user: - args += ['-P', user] - call(args) + if proxy: + proxy = proxy.strip('/') + if proxy[:7] == 'http://': + proxy = proxy[7:] + elif proxy[:8] == 'https://': + proxy = proxy[8:] + s = proxy.split('@') + user = None + if len(s) == 2: + user, proxy = s + args = ['proxytunnel', '-p', proxy, '-d', host + ':' + port] + if user: + args += ['-P', user] + call(args) -else: - call(['nc', host, port]) + else: + call(['nc', host, port]) +except KeyboardInterrupt: + pass # #!/usr/bin/env bash