1 files changed, 21 insertions, 19 deletions
diff --git a/scripts/build-firmware-package.py b/scripts/build-firmware-package.py
index 9a58970..b36b55e 100755
--- a/scripts/build-firmware-package.py
+++ b/scripts/build-firmware-package.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import subprocess
 import tempfile
@@ -6,18 +6,25 @@ import argparse
 import hashlib
 import tarfile
 import json
+import sys
 import os
 
+def run(*args, **kwargs):
+    kwargs.update(stdout = subprocess.PIPE, universal_newlines = True, check = True)
+    return subprocess.run(args, **kwargs)
+
 parser = argparse.ArgumentParser()
 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()
 
 tar     = tarfile.TarFile.open(fileobj = args.tarfile, mode = "w|gz")
-head    = subprocess.check_output(("git", "rev-parse", "HEAD")).strip()
-time    = subprocess.check_output(("git", "show", "-s", "--format=%ct", "HEAD")).strip()
-commits = dict((path, hash) for hash, path, branch in
-               (line.split() for line in subprocess.check_output(("git", "submodule", "status")).splitlines()))
+head    = run("git", "rev-parse", "HEAD").stdout.strip()
+time    = run("git", "show", "-s", "--format=%ct", "HEAD").stdout.strip()
+commits = { path: hash
+            for hash, path, branch in (
+                    line.split()
+                    for line in run("git", "submodule", "status").stdout.splitlines() ) }
 sha256  = {}
 
 for fn in args.firmware:
@@ -25,20 +32,15 @@ for fn in args.firmware:
         sha256[os.path.basename(fn)] = hashlib.sha256(f.read()).hexdigest()
     tar.add(fn, os.path.basename(fn))
 
-with tempfile.NamedTemporaryFile() as f:
-    os.fchmod(f.fileno(), 0644)
-    use_gpg = os.path.isdir(os.getenv("GNUPGHOME", ""))
-    if use_gpg:
-        gpg = subprocess.Popen(("gpg", "--clearsign", "--personal-digest-preferences", "SHA256", "--no-permission-warning"),
-                               stdin = subprocess.PIPE, stdout = f)
-        jf = gpg.stdin
-    else:
-        jf = f
-    json.dump(dict(head = head, time = time, commits = commits, sha256  = sha256), jf, indent = 2)
-    if use_gpg:
-        gpg.stdin.close()
-        if gpg.wait():
-            raise subprocess.CalledProcessError(gpg.returncode, "gpg")
+manifest = json.dumps(dict(head = head, time = time, commits = commits, sha256  = sha256), indent = 2, sort_keys = True)
+
+if os.path.isdir(os.getenv("GNUPGHOME", "")):
+    manifest = run("gpg", "--clearsign", "--personal-digest-preferences", "SHA256", "--no-permission-warning",
+                   input = manifest).stdout
+
+with tempfile.NamedTemporaryFile("w+") as f:
+    os.fchmod(f.fileno(), 0o644)
+    f.write(manifest)
     f.seek(0)
     tar.add(f.name, "MANIFEST")