From 63906d328f7f2c2f99d98b7d56ceee4d7a127a4f Mon Sep 17 00:00:00 2001 From: Martin Sekera Date: Sun, 1 Aug 2021 09:56:32 +0200 Subject: [PATCH 1/3] fix unpack.sh directory --- btv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/btv b/btv index 5646eff..85701d2 100755 --- a/btv +++ b/btv @@ -252,7 +252,7 @@ def serialize(snap, outdir, key, snap_from=None): f.write("#! /bin/sh\n\nsha512sum --check manifest.sha512\n") os.chmod(f.name, 0o500) - shutil.copy("/usr/share/btv/unpack.sh", "unpack.sh") + shutil.copy("/usr/share/btv/unpack.sh", os.path.join(directory, "unpack.sh")) os.chmod("unpack.sh", 0o500) ## fix permissions and ownership of created objects From bbd568260aa6e5fd5ba91dea0032f55f1b523856 Mon Sep 17 00:00:00 2001 From: Martin Sekera Date: Sun, 1 Aug 2021 10:14:40 +0200 Subject: [PATCH 2/3] fix unpack.sh chmod --- btv | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/btv b/btv index 85701d2..fd3ea57 100755 --- a/btv +++ b/btv @@ -252,8 +252,9 @@ def serialize(snap, outdir, key, snap_from=None): f.write("#! /bin/sh\n\nsha512sum --check manifest.sha512\n") os.chmod(f.name, 0o500) - shutil.copy("/usr/share/btv/unpack.sh", os.path.join(directory, "unpack.sh")) - os.chmod("unpack.sh", 0o500) + unpack_path = os.path.join(directory, "unpack.sh") + shutil.copy("/usr/share/btv/unpack.sh", unpack_path) + os.chmod(unpack_path, 0o500) ## fix permissions and ownership of created objects outdir_stat = os.stat(outdir) From 83bac5876dc98dc46f8b4c02c06f718d8521e45a Mon Sep 17 00:00:00 2001 From: Martin Sekera Date: Sun, 15 Jan 2023 18:53:52 +0100 Subject: [PATCH 3/3] simplify shapshot naming --- btv | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/btv b/btv index fd3ea57..206c75c 100755 --- a/btv +++ b/btv @@ -199,9 +199,9 @@ def serialize(snap, outdir, key, snap_from=None): ## prepare directories ## if snap_from: - name = "%s diff from %s" %(snap.name, snap_from.name) + name = "%s to %s" %(snap_from.name, snap.name) else: - name = "%s full" %(snap.name) + name = snap.name directory = os.path.join(outdir, name) os.makedirs(directory)