From 72451d7a546087da6d917a3f4d6d326c0533c956 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <henrik@trineo.org>
Date: Fri, 27 Mar 2020 08:11:18 +0100
Subject: [PATCH] FIX: fix path and use of env var
---
backup.py => utils/backup.py | 5 +++--
log.py => utils/log.py | 0
log.sh => utils/log.sh | 0
3 files changed, 3 insertions(+), 2 deletions(-)
rename backup.py => utils/backup.py (93%)
rename log.py => utils/log.py (100%)
rename log.sh => utils/log.sh (100%)
diff --git a/backup.py b/utils/backup.py
similarity index 93%
rename from backup.py
rename to utils/backup.py
index 1bdbeaf..1e459c2 100755
--- a/backup.py
+++ b/utils/backup.py
@@ -43,14 +43,15 @@ out : str
A YAML text representation of the backup process.
"""
- command = ["./utils/backup.sh"]
+ utils_path = os.path.dirname(__file__)
+ command = [os.path.join(utils_path, "backup.sh")]
env = os.environ.copy()
if not directory:
os.makedirs("/tmp/caosdb/tmpfiles/backup/", exist_ok=True)
directory = tempfile.mkdtemp(dir="/tmp/caosdb/tmpfiles/backup/",
prefix="backup.")
- env["BACKUPDIR"] = directory
+ env["BACKUPDIR"] = directory
result = subprocess.run(command, cwd=os.path.dirname(__file__), env=env)
diff --git a/log.py b/utils/log.py
similarity index 100%
rename from log.py
rename to utils/log.py
diff --git a/log.sh b/utils/log.sh
similarity index 100%
rename from log.sh
rename to utils/log.sh
--
GitLab