From e12ed58107d89070cf73bf2119b847e83a60d5f9 Mon Sep 17 00:00:00 2001 From: Christian Rotzoll Date: Tue, 2 Apr 2019 03:07:04 +0100 Subject: [PATCH] better check if running --- home.admin/config.scripts/internet.sshtunnel.py | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/home.admin/config.scripts/internet.sshtunnel.py b/home.admin/config.scripts/internet.sshtunnel.py index fc82ebc..eda5911 100755 --- a/home.admin/config.scripts/internet.sshtunnel.py +++ b/home.admin/config.scripts/internet.sshtunnel.py @@ -40,12 +40,10 @@ if sys.argv[1] == "on": # check if already running try: - already_running = subprocess.check_output("systemctl is-enabled %s" % (SERVICENAME) ,shell=True, universal_newlines=True) + subprocess.call("systemctl is-enabled %s" % (SERVICENAME) ,shell=True, universal_newlines=True) except subprocess.CalledProcessError as e: - already_running = "disabled" - if str(already_running).count("enabled") > 0: - print("already ON - run 'internet.sshtunnel.py off' first") - sys.exit(1) + print("already ON - run 'internet.sshtunnel.py off' first") + sys.exit(1) # check server address if len(sys.argv) < 3: @@ -144,12 +142,10 @@ elif sys.argv[1] == "off": # check if already disabled try: - alreadyRunning = subprocess.check_output("systemctl is-enabled %s" % (SERVICENAME) ,shell=True, universal_newlines=True) + subprocess.call("systemctl is-disabled %s" % (SERVICENAME) ,shell=True, universal_newlines=True) except subprocess.CalledProcessError as e: - already_running = "disabled" - if str(alreadyRunning).count("enabled") == 0: - print("Was already OFF") - sys.exit(0) + print("Was already OFF") + sys.exit(0) print("*** Disabling systemd service: %s" % (SERVICENAME)) subprocess.call("sudo systemctl stop %s" % (SERVICENAME), shell=True)