From c2acfa64318a8f20c23ae301018194751ebc2177 Mon Sep 17 00:00:00 2001 From: Martin Date: Fri, 13 Sep 2019 19:24:55 +0200 Subject: [PATCH] use subprocess instead --- PKGBUILD | 4 ++-- {bin => lib}/safe-harbor.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) rename {bin => lib}/safe-harbor.py (74%) diff --git a/PKGBUILD b/PKGBUILD index 1fe83ff..2d84376 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -20,11 +20,11 @@ package() { cd $pkgname # prepare dirs - install -dm755 "$pkgdir/usr/bin" + install -dm755 "$pkgdir/usr/lib/safe-harbor" install -dm755 "$pkgdir/usr/lib/systemd/system" install -dm755 "$pkgdir/etc/safe-harbor" - cp bin/safe-harbor.py "$pkgdir/usr/bin" + cp bin/safe-harbor.py "$pkgdir/usr/lib/safe-harbor" cp systemd/safe-harbor@.service "$pkgdir/usr/lib/systemd/system" cp config.json.example "$pkgdir/etc/safe-harbor" } diff --git a/bin/safe-harbor.py b/lib/safe-harbor.py similarity index 74% rename from bin/safe-harbor.py rename to lib/safe-harbor.py index 8d18ed3..6e8c5ec 100755 --- a/bin/safe-harbor.py +++ b/lib/safe-harbor.py @@ -3,7 +3,7 @@ import jsmin import json -import os +import subprocess import sys if __name__ == "__main__": @@ -15,7 +15,7 @@ if __name__ == "__main__": with open(cfg_path) as f: cfg = json.loads(jsmin.jsmin(f.read())) - command = ["/usr/bin/ssh", "ssh", "-o", "ServerAliveInterval 45", "-o", "ServerAliveCountMax 2", "-o", "ExitOnForwardFailure yes", "-N"] + command = ["/usr/bin/ssh", "-o", "ServerAliveInterval 45", "-o", "ServerAliveCountMax 2", "-o", "ExitOnForwardFailure yes", "-N"] for m in cfg["mapping"]: command.append("-R") @@ -24,4 +24,4 @@ if __name__ == "__main__": command.append("%s@%s" %(cfg["user"], cfg["host"])) # replace this process, systemd will restart us if needed - os.execl(*command) + subprocess.run(command)