Cleanup.

1 files changed, 19 insertions, 11 deletions

diff --git a/build-package.py b/build-package.py
index ae7b0b1..4f35cff 100644
--- a/build-package.py
+++ b/build-package.py
@@ -6,8 +6,11 @@ import argparse
 import hashlib
 import tarfile
 import json
+import os
 
 parser = argparse.ArgumentParser()
+parser.add_argument("--gpgdir", default = "/home/aptbot/gnupg", help = "gpg keyring directory")
+parser.add_argument("--dir-name", help = "internal directory name for files")
 parser.add_argument("tarfile", type = argparse.FileType("wb"), help = "tarball to create")
 parser.add_argument("firmware", nargs = "+", help = "firmware files to stuff into tarball")
 args = parser.parse_args()
@@ -17,23 +20,28 @@ tar = tarfile.TarFile(mode = "w", fileobj = args.tarfile)
 status = [line.split() for line in subprocess.check_output(("git", "submodule", "status")).splitlines()]
 sha256 = {}
 
+def tar_add(fn, name = None):
+    if name is None:
+        name = os.path.basename(fn)
+    tar.add(fn, name if args.dir_name is None else os.path.join(args.dir_name, name))
+
 for fn in args.firmware:
     with open(fn, "rb") as f:
         sha256[fn] = hashlib.sha256(f.read()).hexdigest()
-    tar.add(fn)
-
-# export GNUPGHOME := /home/aptbot/gnupg
-# --no-default-keyring --keyring isc-pubring.gpg --secret-keyring isc-secring.gpg
+    tar_add(fn)
 
 with tempfile.NamedTemporaryFile() as f:
-    gpg = subprocess.Popen(("gpg", "--clearsign", "--no-default-keyring", 
-                            "--keyring",        "/home/aptbot/gnupg/pubring.gpg",
-                            "--secret-keyring", "/home/aptbot/gnupg/secring.gpg",
-                            "--trustdb-name",   "/home/aptbot/gnupg/trustdb.gpg",
-                            "--no-random-seed-file", "--no-permission-warning",
-                            "--personal-digest-preferences", "SHA256"),
+    gpg = subprocess.Popen(("gpg",
+                            "--clearsign",
+                            "--no-random-seed-file",
+                            "--no-default-keyring",
+                            "--no-permission-warning",
+                            "--personal-digest-preferences", "SHA256",
+                            "--keyring",        os.path.join(args.gpgdir, "pubring.gpg"),
+                            "--secret-keyring", os.path.join(args.gpgdir, "secring.gpg"),
+                            "--trustdb-name",   os.path.join(args.gpgdir, "trustdb.gpg")),
                            stdin = subprocess.PIPE, stdout = f)
     json.dump(dict(commits = status, sha256  = sha256), gpg.stdin, indent = 2)
     gpg.stdin.close()
     gpg.wait()
-    tar.add(f.name, "+MANIFEST")
+    tar_add(f.name, "MANIFEST")