From d290d8613f41ae1d06f3502dd93023d839bb7816 Mon Sep 17 00:00:00 2001 From: Christian Rotzoll Date: Wed, 3 Apr 2019 18:59:56 +0100 Subject: [PATCH] clean port strings --- home.admin/_bootstrap.provision.sh | 2 +- home.admin/config.scripts/internet.sshtunnel.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/home.admin/_bootstrap.provision.sh b/home.admin/_bootstrap.provision.sh index 9c49b5e..5a318f8 100644 --- a/home.admin/_bootstrap.provision.sh +++ b/home.admin/_bootstrap.provision.sh @@ -185,7 +185,7 @@ if [ "${#sshtunnel}" -gt 0 ]; then sudo sed -i "s/^message=.*/message='Setup SSH Tunnel'/g" ${infoFile} sudo /home/admin/config.scripts/internet.sshtunnel.py restore ${sshtunnel} >> ${logFile} 2>&1 else - echo "Provisioning SSH Tunnel - keep default" >> ${logFile} + echo "Provisioning SSH Tunnel - not active" >> ${logFile} fi # ROOT SSH KEYS diff --git a/home.admin/config.scripts/internet.sshtunnel.py b/home.admin/config.scripts/internet.sshtunnel.py index 743df23..e7fafa8 100755 --- a/home.admin/config.scripts/internet.sshtunnel.py +++ b/home.admin/config.scripts/internet.sshtunnel.py @@ -90,7 +90,7 @@ if sys.argv[1] == "on": sys.exit(1) # get ports - ports = sys.argv[i].split("<") + ports = re.sub('\W+','', sys.argv[i] ).split("<") port_internal = ports[0] port_external = ports[1] if port_internal.isdigit() == False: